aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-03-16 20:53:42 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-03-16 20:53:42 -0400
commit4b3591e2c42e80efdd3dc15a96fb610f9cbf02bd (patch)
treeafe284accebb9c68ad2a245c6496104f245b9b72 /src
parent1c6e624631cb339b9e5e437083bca971530bba9f (diff)
downloadcryptography-4b3591e2c42e80efdd3dc15a96fb610f9cbf02bd.tar.gz
cryptography-4b3591e2c42e80efdd3dc15a96fb610f9cbf02bd.tar.bz2
cryptography-4b3591e2c42e80efdd3dc15a96fb610f9cbf02bd.zip
SSL_CIPHER_get_version gained a const return type in 1.1.0
Diffstat (limited to 'src')
-rw-r--r--src/_cffi_src/openssl/ssl.py3
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);