summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2018-05-14 15:51:45 (GMT)
committerGitHub <noreply@github.com>2018-05-14 15:51:45 (GMT)
commitf04224210d93212bd9ad17d67ef5e1c70171a13e (patch)
treede8db94d3000cbcac6b18add5db1c781ebe0be34
parent2473eea65d592a80a5362a00362738a33196aba1 (diff)
downloadcpython-f04224210d93212bd9ad17d67ef5e1c70171a13e.zip
cpython-f04224210d93212bd9ad17d67ef5e1c70171a13e.tar.gz
cpython-f04224210d93212bd9ad17d67ef5e1c70171a13e.tar.bz2
Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6800)
-rw-r--r--Modules/_ssl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4baabd5..650f030 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) {