diff options
| author | Tim Kelsey <tim.kelsey@hp.com> | 2014-12-17 14:09:09 +0000 |
|---|---|---|
| committer | Tim Kelsey <tim.kelsey@hp.com> | 2014-12-17 14:11:42 +0000 |
| commit | adaa14b9b505b12c8cf4fd865bcc866c081ff918 (patch) | |
| tree | fe9445b6fec885d38dc3c866e7fa548731624fee | |
| parent | 8a482ba46eb891408d2f8b10dc2ed68849b73542 (diff) | |
| download | cryptography-adaa14b9b505b12c8cf4fd865bcc866c081ff918.tar.gz cryptography-adaa14b9b505b12c8cf4fd865bcc866c081ff918.tar.bz2 cryptography-adaa14b9b505b12c8cf4fd865bcc866c081ff918.zip | |
Making EVP_sha* bindings none conditional.
- these were added in OpenSSL 0.9.8, a supported version.
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/evp.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/evp.py b/src/cryptography/hazmat/bindings/openssl/evp.py index f79be981..f00c2f0d 100644 --- a/src/cryptography/hazmat/bindings/openssl/evp.py +++ b/src/cryptography/hazmat/bindings/openssl/evp.py @@ -93,6 +93,10 @@ int EVP_VerifyFinal(EVP_MD_CTX *, const unsigned char *, unsigned int, const EVP_MD *EVP_md5(void); const EVP_MD *EVP_sha1(void); const EVP_MD *EVP_ripemd160(void); +const EVP_MD *EVP_sha224(void); +const EVP_MD *EVP_sha256(void); +const EVP_MD *EVP_sha384(void); +const EVP_MD *EVP_sha512(void); int PKCS5_PBKDF2_HMAC_SHA1(const char *, int, const unsigned char *, int, int, int, unsigned char *); @@ -221,13 +225,6 @@ int (*EVP_PKEY_assign_EC_KEY)(EVP_PKEY *, EC_KEY *) = NULL; EC_KEY *(*EVP_PKEY_get1_EC_KEY)(EVP_PKEY *) = NULL; int (*EVP_PKEY_set1_EC_KEY)(EVP_PKEY *, EC_KEY *) = NULL; #endif - -#if OPENSSL_VERSION_NUMBER >= 0x0090800fL -const EVP_MD *EVP_sha224(void); -const EVP_MD *EVP_sha256(void); -const EVP_MD *EVP_sha384(void); -const EVP_MD *EVP_sha512(void); -#endif """ CONDITIONAL_NAMES = { |