diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/bindings/openssl/asn1.py | 7 | ||||
-rw-r--r-- | src/cryptography/hazmat/bindings/openssl/evp.py | 15 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/asn1.py b/src/cryptography/hazmat/bindings/openssl/asn1.py index fbc0822a..7c4a752c 100644 --- a/src/cryptography/hazmat/bindings/openssl/asn1.py +++ b/src/cryptography/hazmat/bindings/openssl/asn1.py @@ -104,15 +104,8 @@ void ASN1_UTCTIME_free(ASN1_UTCTIME *); int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *, time_t); ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *, time_t); int ASN1_UTCTIME_check(ASN1_UTCTIME *); - -/* DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER */ -/* int ASN1_UTCTIME_set_string(ASN1_UTCTIME *, const char *); */ - int ASN1_UTCTIME_print(BIO * , ASN1_UTCTIME *); -/* no such symbol on OSX (10.9.5 maybe others) */ -/* ASN1_UTCTIME *ASN1_UTCTIME_dup(const ASN1_UTCTIME *); */ - /* ASN1 GENERALIZEDTIME */ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *, const char *); void ASN1_GENERALIZEDTIME_free(ASN1_GENERALIZEDTIME *); diff --git a/src/cryptography/hazmat/bindings/openssl/evp.py b/src/cryptography/hazmat/bindings/openssl/evp.py index 8c4a88e0..f79be981 100644 --- a/src/cryptography/hazmat/bindings/openssl/evp.py +++ b/src/cryptography/hazmat/bindings/openssl/evp.py @@ -94,15 +94,6 @@ const EVP_MD *EVP_md5(void); const EVP_MD *EVP_sha1(void); const EVP_MD *EVP_ripemd160(void); -/*#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*/ - int PKCS5_PBKDF2_HMAC_SHA1(const char *, int, const unsigned char *, int, int, int, unsigned char *); @@ -231,6 +222,12 @@ 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 = { |