commit caad666d34835265b9ebf9bb57d0ef53691c6388
author Paul Kehrer <paul.l.kehrer@gmail.com> Mon Jun 26 15:07:25 2017 -1000
committer Alex Gaynor <alex.gaynor@gmail.com> Mon Jun 26 21:07:25 2017 -0400
tree 249f886dfaee1ca306322b560e432647ef871600
parent b867003543fca711f7c75b9050c30122dce14558

bind DTLS 1.2 methods (#3725)

* bind DTLS 1.2 methods

* remove version specific dtls bindings, rename sentinel value

src/_cffi_src/openssl/ssl.py

diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 48a8278..99d67bb 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -26,6 +26,7 @@
 static const long Cryptography_HAS_SSL_CTX_SET_CLIENT_CERT_ENGINE;
 static const long Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS;
 static const long Cryptography_HAS_DTLS;
+static const long Cryptography_HAS_GENERIC_DTLS_METHOD;
 
 /* Internally invented symbol to tell us if SNI is supported */
 static const long Cryptography_HAS_TLSEXT_HOSTNAME;
@@ -331,6 +332,11 @@
 const SSL_METHOD *DTLSv1_server_method(void);
 const SSL_METHOD *DTLSv1_client_method(void);
 
+/* Added in 1.0.2 */
+const SSL_METHOD *DTLS_method(void);
+const SSL_METHOD *DTLS_server_method(void);
+const SSL_METHOD *DTLS_client_method(void);
+
 const SSL_METHOD *SSLv23_method(void);
 const SSL_METHOD *SSLv23_server_method(void);
 const SSL_METHOD *SSLv23_client_method(void);
@@ -590,6 +596,15 @@
 static const long TLS_ST_OK = 0;
 #endif
 
+#if defined(OPENSSL_NO_DTLS) || CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
+const SSL_METHOD *(*DTLS_method)(void) = NULL;
+const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
+const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
+#else
+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'. */

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 10c94d7..de9cac8 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -150,6 +150,11 @@
         "Cryptography_DTLSv1_get_timeout",
         "DTLSv1_handle_timeout",
     ],
+    "Cryptography_HAS_GENERIC_DTLS_METHOD": [
+        "DTLS_method",
+        "DTLS_server_method",
+        "DTLS_client_method",
+    ],
     "Cryptography_HAS_EVP_PKEY_DHX": [
         "EVP_PKEY_DHX",
         "Cryptography_d2i_DHxparams_bio",