diff --git a/Misc/NEWS b/Misc/NEWS index 188a09d3061..7b3bebce367 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -90,6 +90,9 @@ Core and Builtins Library ------- +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC + IV attack countermeasure. + - Issue #6631: Disallow relative file paths in urllib urlopen methods. - Issue #13781: Prevent gzip.GzipFile from using the dummy filename provided by diff --git a/Modules/_ssl.c b/Modules/_ssl.c index becf6a50b3d..eaf67c49a9a 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -369,7 +369,8 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file, } /* ssl compatibility */ - SSL_CTX_set_options(self->ctx, SSL_OP_ALL); + SSL_CTX_set_options(self->ctx, + SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); verification_mode = SSL_VERIFY_NONE; if (certreq == PY_SSL_CERT_OPTIONAL)