diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-11-12 06:45:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-11-12 06:45:22 (GMT) |
| commit | 45bde5d2ee58ac4887b034569c2ee930b3cfb8af (patch) | |
| tree | ee7a1a5928c47f94f8407c270d967c4a9526e081 /Modules | |
| parent | 86429bd1749e475145198b2d1498ef43b2597ab2 (diff) | |
| parent | a9dcdabccb1a1f7c76030c0b188ecaf7ab599e57 (diff) | |
| download | cpython-45bde5d2ee58ac4887b034569c2ee930b3cfb8af.zip cpython-45bde5d2ee58ac4887b034569c2ee930b3cfb8af.tar.gz cpython-45bde5d2ee58ac4887b034569c2ee930b3cfb8af.tar.bz2 | |
merge 3.4 (#25530)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index a918586..b04a637 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2276,6 +2276,8 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; if (proto_version != PY_SSL_VERSION_SSL2) options |= SSL_OP_NO_SSLv2; + if (proto_version != PY_SSL_VERSION_SSL3) + options |= SSL_OP_NO_SSLv3; SSL_CTX_set_options(self->ctx, options); #ifndef OPENSSL_NO_ECDH |