]> granicus.if.org Git - python/commitdiff
Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6800)
authorAlex Gaynor <alex.gaynor@gmail.com>
Mon, 14 May 2018 15:51:45 +0000 (11:51 -0400)
committerGitHub <noreply@github.com>
Mon, 14 May 2018 15:51:45 +0000 (11:51 -0400)
Modules/_ssl.c

index 4baabd52bc9f2e1e0eb70884d89422a826333d91..650f030345f7a6b0ad65cb8b0ad4395ce87deffb 100644 (file)
@@ -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) {