diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-11 06:50:06 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-11 06:50:06 -0500 |
| commit | e40a03f61e907d0de5fb07624cb6306323de543d (patch) | |
| tree | c08dd5d1772e69f64ffd05243f13f8d8563b1fe6 | |
| parent | d4853b494b2a7f290264d40bef65f152eb2d4727 (diff) | |
| parent | b8e09409931d9d8cf707666481e9990a829db508 (diff) | |
| download | cryptography-e40a03f61e907d0de5fb07624cb6306323de543d.tar.gz cryptography-e40a03f61e907d0de5fb07624cb6306323de543d.tar.bz2 cryptography-e40a03f61e907d0de5fb07624cb6306323de543d.zip | |
Merge pull request #2804 from reaperhulk/110-patch-24
X509_STORE_CTX_get_ex_new_index is a macro in 1.1.0
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index f8467a76..13287797 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -173,8 +173,6 @@ int X509_STORE_CTX_get_error(X509_STORE_CTX *); void X509_STORE_CTX_set_error(X509_STORE_CTX *, int); int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *); X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *); -int X509_STORE_CTX_get_ex_new_index(long, void *, CRYPTO_EX_new *, - CRYPTO_EX_dup *, CRYPTO_EX_free *); int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *, int, void *); void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *, int); @@ -194,6 +192,10 @@ int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *); """ MACROS = """ +/* this CRYPTO_EX_DATA function became a macro in 1.1.0 */ +int X509_STORE_CTX_get_ex_new_index(long, void *, CRYPTO_EX_new *, + CRYPTO_EX_dup *, CRYPTO_EX_free *); + /* X509_STORE_CTX */ void X509_STORE_CTX_set0_crls(X509_STORE_CTX *, Cryptography_STACK_OF_X509_CRL *); |