From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 14 May 2018 17:45:45 +0000 (-0700)
Subject: Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6807)
X-Git-Tag: v3.7.0b5~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67d1968a41ccc954bdaf841bcabc4138a5ed04d7;p=python

Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6807)

(cherry picked from commit f04224210d93212bd9ad17d67ef5e1c70171a13e)

Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4baabd52bc..650f030345 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -919,11 +919,8 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
         BIO_up_ref(outbio->bio);
         SSL_set_bio(self->ssl, inbio->bio, outbio->bio);
     }
-    mode = SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
-#ifdef SSL_MODE_AUTO_RETRY
-    mode |= SSL_MODE_AUTO_RETRY;
-#endif
-    SSL_set_mode(self->ssl, mode);
+    SSL_set_mode(self->ssl,
+                 SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY);
 
     if (server_hostname != NULL) {
         if (_ssl_configure_hostname(self, server_hostname) < 0) {