From e8afc685c21f0eb7888543b453df38c0b76c3234 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 14 Feb 2014 15:34:22 -0600 Subject: when declaring macros it helps to get the arguments right --- cryptography/hazmat/bindings/openssl/evp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/cryptography/hazmat/bindings/openssl/evp.py index a883084f..641bcfbf 100644 --- a/cryptography/hazmat/bindings/openssl/evp.py +++ b/cryptography/hazmat/bindings/openssl/evp.py @@ -113,7 +113,7 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *, int, int, void *); int PKCS5_PBKDF2_HMAC(const char *, int, const unsigned char *, int, int, const EVP_MD *, int, unsigned char *); -int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *, EVP_MD_CTX *); +int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *, const EVP_MD *); // not macros but must be in this section since they're not available in 0.9.8 EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *, ENGINE *); -- cgit v1.2.3 From de6ed4865e75dc10250591c5d280097c36b1b170 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 14 Feb 2014 15:34:55 -0600 Subject: methods to open an EVP_PKEY from an RSA or DSA struct in OpenSSL --- cryptography/hazmat/bindings/openssl/evp.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/cryptography/hazmat/bindings/openssl/evp.py index 641bcfbf..9cd316f9 100644 --- a/cryptography/hazmat/bindings/openssl/evp.py +++ b/cryptography/hazmat/bindings/openssl/evp.py @@ -101,6 +101,9 @@ const EVP_MD *EVP_md5(void); int PKCS5_PBKDF2_HMAC_SHA1(const char *, int, const unsigned char *, int, int, int, unsigned char *); + +int EVP_PKEY_set1_RSA(EVP_PKEY *, struct rsa_st *); +int EVP_PKEY_set1_DSA(EVP_PKEY *, struct dsa_st *); """ MACROS = """ -- cgit v1.2.3