diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-08 17:35:41 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-08 16:35:41 -0500 |
| commit | 538a953f1f67cafdb06840427eb5d2a7cad1a518 (patch) | |
| tree | aaebbb68fed64d3282261174861f77c3026772ce | |
| parent | bb631441a3c3e9782fb4be20ec09bceadeb05fa8 (diff) | |
| download | cryptography-538a953f1f67cafdb06840427eb5d2a7cad1a518.tar.gz cryptography-538a953f1f67cafdb06840427eb5d2a7cad1a518.tar.bz2 cryptography-538a953f1f67cafdb06840427eb5d2a7cad1a518.zip | |
Remove conditionals we never use. (#3766)
* Remove conditionals we never use.
Refs #3763
* put this back
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 6 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 8fef9460..8bda4e01 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -602,7 +602,6 @@ const SSL_METHOD *(*DTLS_client_method)(void) = NULL; static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; #endif -#ifndef OPENSSL_NO_DTLS static const long Cryptography_HAS_DTLS = 1; /* Wrap DTLSv1_get_timeout to avoid cffi to handle a 'struct timeval'. */ long Cryptography_DTLSv1_get_timeout(SSL *ssl, time_t *ptv_sec, @@ -622,9 +621,4 @@ long Cryptography_DTLSv1_get_timeout(SSL *ssl, time_t *ptv_sec, return r; } -#else -static const long Cryptography_HAS_DTLS = 0; -long (*DTLSv1_get_timeout_wrapped)(SSL *, time_t *, long int *) = NULL; -long (*DTLSv1_handle_timeout)(SSL *) = NULL; -#endif """ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index de9cac82..e9bbba69 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -146,10 +146,6 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_SCRYPT": [ "EVP_PBE_scrypt", ], - "Cryptography_HAS_DTLS": [ - "Cryptography_DTLSv1_get_timeout", - "DTLSv1_handle_timeout", - ], "Cryptography_HAS_GENERIC_DTLS_METHOD": [ "DTLS_method", "DTLS_server_method", |