commit 538a953f1f67cafdb06840427eb5d2a7cad1a518
author Alex Gaynor <alex.gaynor@gmail.com> Sat Jul 08 17:35:41 2017 -0400
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat Jul 08 16:35:41 2017 -0500
tree aaebbb68fed64d3282261174861f77c3026772ce
parent bb631441a3c3e9782fb4be20ec09bceadeb05fa8

Remove conditionals we never use. (#3766)

* Remove conditionals we never use.

Refs #3763

* put this back

src/_cffi_src/openssl/ssl.py

diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 8fef946..8bda4e0 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -602,7 +602,6 @@
 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 @@
 
     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
 """

src/cryptography/hazmat/bindings/openssl/_conditional.py

diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index de9cac8..e9bbba6 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -146,10 +146,6 @@
     "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",