diff options
| author | David Reid <dreid@dreid.org> | 2014-02-14 14:58:52 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-02-14 14:58:52 -0800 |
| commit | 37acfbb14adffe5b012d95e6a6dfe9979b3ef2f8 (patch) | |
| tree | 53a96e5f33456ef03dec9ae0e6077d0a05eac560 | |
| parent | b321562312dcaff955847576010d05082c50d0cd (diff) | |
| parent | de6ed4865e75dc10250591c5d280097c36b1b170 (diff) | |
| download | cryptography-37acfbb14adffe5b012d95e6a6dfe9979b3ef2f8.tar.gz cryptography-37acfbb14adffe5b012d95e6a6dfe9979b3ef2f8.tar.bz2 cryptography-37acfbb14adffe5b012d95e6a6dfe9979b3ef2f8.zip | |
Merge pull request #616 from reaperhulk/openssl-you-spin-me-right-round
More EVP_PKEY related shenanigans
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/evp.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/cryptography/hazmat/bindings/openssl/evp.py index a883084f..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 = """ @@ -113,7 +116,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 *); |