From: Donald Stufft <donald@stufft.io>
Date: Thu, 2 Mar 2017 16:45:29 +0000 (-0500)
Subject: bpo-29697: Don't use OpenSSL <1.0.2 fallback on 1.1+ (GH-395)
X-Git-Tag: v3.7.0a1~1231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ae264ce6dfcd6923d7bbde0e975389bea7d9881;p=python

bpo-29697: Don't use OpenSSL <1.0.2 fallback on 1.1+ (GH-395)
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 1e9a707648..421e0b6716 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2728,12 +2728,12 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
 #endif
 
 
-#ifndef OPENSSL_NO_ECDH
+#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1)
     /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use
        prime256v1 by default.  This is Apache mod_ssl's initialization
        policy, so we should be safe. OpenSSL 1.1 has it enabled by default.
      */
-#if defined(SSL_CTX_set_ecdh_auto) && !defined(OPENSSL_VERSION_1_1)
+#if defined(SSL_CTX_set_ecdh_auto)
     SSL_CTX_set_ecdh_auto(self->ctx, 1);
 #else
     {