diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2018-05-30 22:31:47 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-05-31 10:31:47 +0800 |
| commit | 8a64f1f2fbea73f0b7a4725768dc9597d240c661 (patch) | |
| tree | 38379a1da072116328118a7e8ba266050ad34c4d /src/_cffi_src/openssl/x509_vfy.py | |
| parent | 015483830765fbdd01ce393bd1f02c9f72344a03 (diff) | |
| download | cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.gz cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.bz2 cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.zip | |
Removes branches in bindings for various OpenSSL 1.1.0 prereleases (#4269)
* Remove defines for openssl 1.1.0 pre
* Update bio.py
* Update dh.py
* Update dsa.py
* Update rsa.py
* Update x509_vfy.py
* Compress branches
Diffstat (limited to 'src/_cffi_src/openssl/x509_vfy.py')
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index 58069eb1..a4b91200 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -273,7 +273,7 @@ static const long Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST = 0; static const long X509_V_FLAG_TRUSTED_FIRST = 0; #endif -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE6 +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *ctx) { return ctx->objs; } @@ -283,9 +283,7 @@ X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) { int X509_OBJECT_get_type(const X509_OBJECT *x) { return x->type; } -#endif -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 /* from x509/x509_vfy.c */ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) { @@ -295,9 +293,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) { return x->data.x509; } -#endif -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER = 0; typedef void *X509_STORE_CTX_get_issuer_fn; X509_STORE_CTX_get_issuer_fn (*X509_STORE_get_get_issuer)(X509_STORE *) = NULL; |