commit 05943d7f0f875ecd82b14681249dd3d145fd6d7c
author Alex Gaynor <alex.gaynor@gmail.com> Fri Mar 17 08:55:35 2017 -0400
committer Paul Kehrer <paul.l.kehrer@gmail.com> Fri Mar 17 08:55:35 2017 -0400
tree 1d8e290255f2804ef9114e6c24bd12c81c8b4262
parent d6d2527692195f074c4a384a11bbb7c6aa187826

Remove workaround for weird NetBSD bug (#3458)

src/_cffi_src/openssl/ssl.py

diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 4669151..7f932e2 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -39,11 +39,9 @@
  * supported
  */
 static const long Cryptography_HAS_OP_NO_COMPRESSION;
-
 static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING;
 static const long Cryptography_HAS_SSL_SET_SSL_CTX;
 static const long Cryptography_HAS_SSL_OP_NO_TICKET;
-static const long Cryptography_HAS_NETBSD_D1_METH;
 static const long Cryptography_HAS_ALPN;
 static const long Cryptography_HAS_NEXTPROTONEG;
 static const long Cryptography_HAS_SET_CERT_CB;
@@ -518,25 +516,6 @@
 static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 1;
 static const long Cryptography_HAS_SSL_OP_NO_TICKET = 1;
 static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1;
-
-/* NetBSD shipped without including d1_meth.c. This workaround checks to see
-   if the version of NetBSD we're currently running on is old enough to
-   have the bug and provides an empty implementation so we can link and
-   then remove the function from the ffi object. */
-#ifdef __NetBSD__
-#  include <sys/param.h>
-#  if (__NetBSD_Version__ < 699003800)
-static const long Cryptography_HAS_NETBSD_D1_METH = 0;
-const SSL_METHOD *DTLSv1_method(void) {
-    return NULL;
-}
-#  else
-static const long Cryptography_HAS_NETBSD_D1_METH = 1;
-#  endif
-#else
-static const long Cryptography_HAS_NETBSD_D1_METH = 1;
-#endif
-
 static const long Cryptography_HAS_NEXTPROTONEG = 1;
 
 /* ALPN was added in OpenSSL 1.0.2. */

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 8c420c8..f7d67b0 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -78,10 +78,6 @@
         "SSLv3_server_method",
     ],
 
-    "Cryptography_HAS_NETBSD_D1_METH": [
-        "DTLSv1_method",
-    ],
-
     "Cryptography_HAS_ALPN": [
         "SSL_CTX_set_alpn_protos",
         "SSL_set_alpn_protos",