diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-20 13:28:22 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-20 12:28:22 -0500 |
| commit | b5a8ad91afe9ae47401135e5b9b6477b702606bb (patch) | |
| tree | 9586837b7704b6f91a9fdcab42c78329f4ff9951 | |
| parent | 45c0b7446a4de327d2e634371a30d728d6acc378 (diff) | |
| download | cryptography-b5a8ad91afe9ae47401135e5b9b6477b702606bb.tar.gz cryptography-b5a8ad91afe9ae47401135e5b9b6477b702606bb.tar.bz2 cryptography-b5a8ad91afe9ae47401135e5b9b6477b702606bb.zip | |
Remove some more 0.9.8isms from the ssl code (#3001)
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 13c2fa41..d68255c4 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -180,6 +180,7 @@ SSL *SSL_new(SSL_CTX *); void SSL_free(SSL *); int SSL_set_fd(SSL *, int); SSL_CTX *SSL_get_SSL_CTX(const SSL *); +SSL_CTX *SSL_set_SSL_CTX(SSL *, SSL_CTX *); BIO *SSL_get_rbio(const SSL *); BIO *SSL_get_wbio(const SSL *); void SSL_set_bio(SSL *, BIO *, BIO *); @@ -246,6 +247,9 @@ int SSL_CTX_add_client_CA(SSL_CTX *, X509 *); void SSL_CTX_set_client_CA_list(SSL_CTX *, Cryptography_STACK_OF_X509_NAME *); +void SSL_CTX_set_info_callback(SSL_CTX *, void (*)(const SSL *, int, int)); +void (*SSL_CTX_get_info_callback(SSL_CTX *))(const SSL *, int, int); + /* SSL_SESSION */ void SSL_SESSION_free(SSL_SESSION *); @@ -375,14 +379,6 @@ long SSL_CTX_set_tlsext_status_arg(SSL_CTX *, void *); long SSL_session_reused(SSL *); -/* The following were macros in 0.9.8e. Once we drop support for RHEL/CentOS 5 - we should move these back to FUNCTIONS. */ -void SSL_CTX_set_info_callback(SSL_CTX *, void (*)(const SSL *, int, int)); -void (*SSL_CTX_get_info_callback(SSL_CTX *))(const SSL *, int, int); -/* This function does not exist in 0.9.8e. Once we drop support for - RHEL/CentOS 5 this can be moved back to FUNCTIONS. */ -SSL_CTX *SSL_set_SSL_CTX(SSL *, SSL_CTX *); - /* NPN APIs were introduced in OpenSSL 1.0.1. To continue to support earlier * versions some special handling of these is necessary. */ |