diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-09 12:45:53 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-09 12:45:53 -0700 |
| commit | 09df9690ae7fc4cb39101621916d74979b45a8a6 (patch) | |
| tree | df6302ea5fea85e6759eac60b50444d6ca70bbf0 | |
| parent | 7f70190bb9b45781b351735d40b77328efaa9d71 (diff) | |
| parent | c2cb1c3d347e06bd6497c12752c729fd63fbdb1b (diff) | |
| download | cryptography-09df9690ae7fc4cb39101621916d74979b45a8a6.tar.gz cryptography-09df9690ae7fc4cb39101621916d74979b45a8a6.tar.bz2 cryptography-09df9690ae7fc4cb39101621916d74979b45a8a6.zip | |
Merge pull request #1296 from reaperhulk/fix-1295
X509_VERIFY_PARAM_set_hostflags is available in 1.0.2-beta2
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/x509_vfy.py | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/cryptography/hazmat/bindings/openssl/x509_vfy.py b/cryptography/hazmat/bindings/openssl/x509_vfy.py index a53716b0..3efc0f11 100644 --- a/cryptography/hazmat/bindings/openssl/x509_vfy.py +++ b/cryptography/hazmat/bindings/openssl/x509_vfy.py @@ -27,7 +27,6 @@ typedef STACK_OF(ASN1_OBJECT) Cryptography_STACK_OF_ASN1_OBJECT; """ TYPES = """ -static const long Cryptography_HAS_X509_VERIFY_PARAM_SET_HOSTFLAGS; static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES; static const long Cryptography_HAS_102_VERIFICATION_PARAMS; static const long Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST; @@ -186,10 +185,10 @@ void X509_STORE_CTX_set0_crls(X509_STORE_CTX *, Cryptography_STACK_OF_X509_CRL *); /* X509_VERIFY_PARAM */ -int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *, const unsigned char *, +int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *, const char *, size_t); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *, unsigned int); -int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *, const unsigned char *, +int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *, const char *, size_t); int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *, const unsigned char *, size_t); @@ -197,15 +196,6 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *, const char *); """ CUSTOMIZATIONS = """ -/* OpenSSL 1.0.2+, but only some very new releases */ -#ifdef X509_VERIFY_PARAM_set_hostflags -static const long Cryptography_HAS_X509_VERIFY_PARAM_SET_HOSTFLAGS = 1; -#else -static const long Cryptography_HAS_X509_VERIFY_PARAM_SET_HOSTFLAGS = 0; -void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PARAM *, - unsigned int) = NULL; -#endif - /* OpenSSL 1.0.2+ verification error codes */ #if OPENSSL_VERSION_NUMBER >= 0x10002000L static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1; @@ -234,13 +224,15 @@ static const long X509_V_FLAG_SUITEB_192_LOS = 0; static const long X509_V_FLAG_SUITEB_128_LOS = 0; static const long X509_V_FLAG_PARTIAL_CHAIN = 0; -int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const unsigned char *, +int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *, size_t) = NULL; -int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const unsigned char *, +int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *, size_t) = NULL; int (*X509_VERIFY_PARAM_set1_ip)(X509_VERIFY_PARAM *, const unsigned char *, size_t) = NULL; int (*X509_VERIFY_PARAM_set1_ip_asc)(X509_VERIFY_PARAM *, const char *) = NULL; +void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PARAM *, + unsigned int) = NULL; #endif /* OpenSSL 1.0.2+, *or* Fedora 20's flavor of OpenSSL 1.0.1e... */ @@ -286,9 +278,6 @@ static const long X509_V_FLAG_CHECK_SS_SIGNATURE = 0; """ CONDITIONAL_NAMES = { - "Cryptography_HAS_X509_VERIFY_PARAM_SET_HOSTFLAGS": [ - "X509_VERIFY_PARAM_set_hostflags", - ], "Cryptography_HAS_102_VERIFICATION_ERROR_CODES": [ 'X509_V_ERR_SUITE_B_INVALID_VERSION', 'X509_V_ERR_SUITE_B_INVALID_ALGORITHM', @@ -310,6 +299,7 @@ CONDITIONAL_NAMES = { "X509_VERIFY_PARAM_set1_email", "X509_VERIFY_PARAM_set1_ip", "X509_VERIFY_PARAM_set1_ip_asc", + "X509_VERIFY_PARAM_set_hostflags", ], "Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST": [ "X509_V_FLAG_TRUSTED_FIRST", |