diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-20 14:45:33 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-11-20 14:45:33 -0600 |
| commit | 7f7fab8f2bb48056149e2717f440b13c3ce5fcf8 (patch) | |
| tree | d440a2fd66d06c373bc5da4a9b314d26227a5002 | |
| parent | cc1962d9ece2496548032074499e2aed475b5271 (diff) | |
| parent | 62fad4c7830555b9cc693b139fbd09a0a46ec291 (diff) | |
| download | cryptography-7f7fab8f2bb48056149e2717f440b13c3ce5fcf8.tar.gz cryptography-7f7fab8f2bb48056149e2717f440b13c3ce5fcf8.tar.bz2 cryptography-7f7fab8f2bb48056149e2717f440b13c3ce5fcf8.zip | |
Merge pull request #2490 from tiran/more_ex_data
Add more CRYPTO_EX_DATA functions
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 12 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509.py | 6 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index ccabb872..83a7386f 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -251,6 +251,15 @@ char *SSL_CIPHER_get_version(const SSL_CIPHER *); size_t SSL_get_finished(const SSL *, void *, size_t); size_t SSL_get_peer_finished(const SSL *, void *, size_t); + +/* CRYPTO_EX_DATA */ +int SSL_get_ex_new_index(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, + CRYPTO_EX_free *); +int SSL_set_ex_data(SSL *, int, void *); + +int SSL_CTX_get_ex_new_index(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, + CRYPTO_EX_free *); +int SSL_CTX_set_ex_data(SSL_CTX *, int, void *); """ MACROS = """ @@ -337,6 +346,9 @@ const SSL_CIPHER *SSL_get_current_cipher(const SSL *); const char *SSL_get_version(const SSL *); int SSL_version(const SSL *); +void *SSL_CTX_get_ex_data(const SSL_CTX *, int); +void *SSL_get_ex_data(const SSL *, int); + /* SNI APIs were introduced in OpenSSL 1.0.0. To continue to support * earlier versions some special handling of these is necessary. */ diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index ebb78a31..b5d461ab 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -149,6 +149,12 @@ X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *); X509_EXTENSION *X509_get_ext(X509 *, int); int X509_get_ext_by_NID(X509 *, int, int); +/* CRYPTO_EX_DATA */ +int X509_get_ex_new_index(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, + CRYPTO_EX_free *); +int X509_set_ex_data(X509 *, int, void *); +void *X509_get_ex_data(X509 *, int); + int X509_EXTENSION_get_critical(X509_EXTENSION *); ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *); void X509_EXTENSION_free(X509_EXTENSION *); diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index abc4c435..f8467a76 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -173,6 +173,8 @@ 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); |