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

[Alex Gaynor]

https://github.com/python/cpython/commit/67d1968a41ccc954bdaf841bcabc4138a5ed04d7
commit: 67d1968a41ccc954bdaf841bcabc4138a5ed04d7
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Alex Gaynor <alex.gaynor at gmail.com>
date: 2018-05-14T13:45:45-04:00
summary:

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 at gmail.com>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4baabd52bc9f..650f030345f7 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) {