diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-26 15:07:48 -1000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-06-26 21:07:48 -0400 |
| commit | 62c3421a73053af5cf09d110f927632dd19f00aa (patch) | |
| tree | b7160115209be11da6a113bea1e46bdc245f82e4 /src/_cffi_src/openssl | |
| parent | caad666d34835265b9ebf9bb57d0ef53691c6388 (diff) | |
| download | cryptography-62c3421a73053af5cf09d110f927632dd19f00aa.tar.gz cryptography-62c3421a73053af5cf09d110f927632dd19f00aa.tar.bz2 cryptography-62c3421a73053af5cf09d110f927632dd19f00aa.zip | |
enable wconversion and finish fixes (#3728)
* enable wconversion and finish fixes
* don't pass -Wconversion if it's win32
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/ecdh.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/evp.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/ecdh.py b/src/_cffi_src/openssl/ecdh.py index 5ed426aa..7f658808 100644 --- a/src/_cffi_src/openssl/ecdh.py +++ b/src/_cffi_src/openssl/ecdh.py @@ -19,7 +19,7 @@ FUNCTIONS = """ MACROS = """ int ECDH_compute_key(void *, size_t, const EC_POINT *, EC_KEY *, void *(*)(const void *, size_t, void *, size_t *)); -int SSL_CTX_set_ecdh_auto(SSL_CTX *, int); +long SSL_CTX_set_ecdh_auto(SSL_CTX *, int); """ CUSTOMIZATIONS = """ @@ -27,7 +27,7 @@ static const long Cryptography_HAS_ECDH = 1; #ifndef SSL_CTX_set_ecdh_auto static const long Cryptography_HAS_SET_ECDH_AUTO = 0; -int (*SSL_CTX_set_ecdh_auto)(SSL_CTX *, int) = NULL; +long (*SSL_CTX_set_ecdh_auto)(SSL_CTX *, int) = NULL; #else static const long Cryptography_HAS_SET_ECDH_AUTO = 1; #endif diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py index 0f538286..a4edfc5a 100644 --- a/src/_cffi_src/openssl/evp.py +++ b/src/_cffi_src/openssl/evp.py @@ -230,8 +230,8 @@ static const long Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint = 1; #else static const long Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint = 0; size_t (*EVP_PKEY_get1_tls_encodedpoint)(EVP_PKEY *, unsigned char **) = NULL; -size_t (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, const unsigned char *, - size_t) = NULL; +int (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, const unsigned char *, + size_t) = NULL; #endif /* OpenSSL 1.1.0+ does this define for us, but if not present we'll do it */ diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 99d67bb1..116a54d4 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -611,7 +611,7 @@ static const long Cryptography_HAS_DTLS = 1; long Cryptography_DTLSv1_get_timeout(SSL *ssl, time_t *ptv_sec, long *ptv_usec) { struct timeval tv = { 0 }; - int r = DTLSv1_get_timeout(ssl, &tv); + long r = DTLSv1_get_timeout(ssl, &tv); if (r == 1) { if (ptv_sec) { |