From: Victor Wagner Date: Wed, 22 Jun 2016 11:07:39 +0000 (+0300) Subject: Merge branch 'master' of https://github.com/vbwagner/ctypescrypto X-Git-Url: https://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=6f4f45464e73a5dbfcba8403491be39644f33c5e;hp=3d2279c5056b4035cbed9b53749ebf5a2c48a333;p=oss%2Fctypescrypto.git Merge branch 'master' of https://github.com/vbwagner/ctypescrypto --- diff --git a/ctypescrypto/engine.py b/ctypescrypto/engine.py index f5bdb75..79f6218 100644 --- a/ctypescrypto/engine.py +++ b/ctypescrypto/engine.py @@ -69,3 +69,7 @@ libcrypto.ENGINE_set_default.argtypes = (c_void_p, c_int) libcrypto.ENGINE_ctrl_cmd_string.argtypes = (c_void_p, c_char_p, c_char_p, c_int) libcrypto.ENGINE_finish.argtypes = (c_char_p, ) +libcrypto.ENGINE_init.argtypes = (c_void_p, ) +libcrypto.UI_OpenSSL.restype = c_void_p +libcrypto.ENGINE_load_private_key.argtypes = (c_void_p, c_char_p, c_void_p, c_void_p) +libcrypto.ENGINE_load_private_key.restype = c_void_p diff --git a/ctypescrypto/x509.py b/ctypescrypto/x509.py index 2226ed9..51f553a 100644 --- a/ctypescrypto/x509.py +++ b/ctypescrypto/x509.py @@ -641,6 +641,7 @@ libcrypto.X509_STORE_new.restype = c_void_p libcrypto.X509_STORE_add_lookup.restype = c_void_p libcrypto.X509_STORE_add_lookup.argtypes = (c_void_p, c_void_p) libcrypto.X509_STORE_add_cert.argtypes = (c_void_p, c_void_p) +libcrypto.X509_STORE_CTX_new.restype = c_void_p libcrypto.X509_STORE_CTX_free.argtypes = (c_void_p,) libcrypto.X509_STORE_CTX_init.argtypes = (c_void_p, c_void_p, c_void_p, c_void_p) @@ -683,6 +684,7 @@ libcrypto.sk_set.restype = c_void_p libcrypto.sk_value.argtypes = (c_void_p, c_int) libcrypto.sk_value.restype = c_void_p libcrypto.sk_delete.argtypes = (c_void_p, c_int) +libcrypto.sk_delete.restype = c_void_p libcrypto.sk_new_null.restype = c_void_p libcrypto.sk_pop_free.argtypes = (c_void_p, c_void_p) libcrypto.sk_push.argtypes = (c_void_p, c_void_p)