diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-01-09 19:09:03 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-01-09 19:09:03 (GMT) |
| commit | 78ace81c93568da30c789f85f8a8ebafb2ed89b2 (patch) | |
| tree | a5c5ff8b7c238d29d7dbd92ddca8ef37bbb04077 /Modules | |
| parent | 5940b929095173be65c9faf04f4bdf429742c8c4 (diff) | |
| parent | 2f7c31678a85f599af30b983ecb8321f225c3f15 (diff) | |
| download | cpython-78ace81c93568da30c789f85f8a8ebafb2ed89b2.zip cpython-78ace81c93568da30c789f85f8a8ebafb2ed89b2.tar.gz cpython-78ace81c93568da30c789f85f8a8ebafb2ed89b2.tar.bz2 | |
Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly asked for.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index a370b1b..2e3c5b1 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -134,9 +134,7 @@ enum py_ssl_cert_requirements { }; enum py_ssl_version { -#ifndef OPENSSL_NO_SSL2 PY_SSL_VERSION_SSL2, -#endif PY_SSL_VERSION_SSL3=1, PY_SSL_VERSION_SSL23, #if HAVE_TLSv1_2 @@ -1999,6 +1997,7 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds) char *kwlist[] = {"protocol", NULL}; PySSLContext *self; int proto_version = PY_SSL_VERSION_SSL23; + long options; SSL_CTX *ctx = NULL; if (!PyArg_ParseTupleAndKeywords( @@ -2055,8 +2054,10 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds) self->check_hostname = 0; /* Defaults */ SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL); - SSL_CTX_set_options(self->ctx, - SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); + options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; + if (proto_version != PY_SSL_VERSION_SSL2) + options |= SSL_OP_NO_SSLv2; + SSL_CTX_set_options(self->ctx, options); #define SID_CTX "Python" SSL_CTX_set_session_id_context(self->ctx, (const unsigned char *) SID_CTX, |