diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-16 21:37:32 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-16 21:37:32 -0400 |
| commit | 3afc392c19fc2c24bfb6595aaa9410f9b85bee7a (patch) | |
| tree | 28ac475984432f2672d3cbee00732135023d2540 /src/_cffi_src/openssl/ssl.py | |
| parent | 63d665e42689f459ea192827bdc0d18d883ac6a1 (diff) | |
| parent | 4b3591e2c42e80efdd3dc15a96fb610f9cbf02bd (diff) | |
| download | cryptography-3afc392c19fc2c24bfb6595aaa9410f9b85bee7a.tar.gz cryptography-3afc392c19fc2c24bfb6595aaa9410f9b85bee7a.tar.bz2 cryptography-3afc392c19fc2c24bfb6595aaa9410f9b85bee7a.zip | |
Merge pull request #2831 from reaperhulk/110-patch-37
SSL_CIPHER_get_version gained a const return type in 1.1.0
Diffstat (limited to 'src/_cffi_src/openssl/ssl.py')
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 75b0f130..b3bc9ca2 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -247,7 +247,6 @@ void SSL_SESSION_free(SSL_SESSION *); /* Information about actually used cipher */ const char *SSL_CIPHER_get_name(const SSL_CIPHER *); int SSL_CIPHER_get_bits(const SSL_CIPHER *, int *); -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); @@ -255,6 +254,8 @@ Cryptography_STACK_OF_X509_NAME *SSL_load_client_CA_file(const char *); """ MACROS = """ +/* Function signature changed to const char * in 1.1.0 */ +const char *SSL_CIPHER_get_version(const SSL_CIPHER *); /* These became macros in 1.1.0 */ int SSL_library_init(void); void SSL_load_error_strings(void); |