From d358e0554bc520768041652676ec8e6076f221a9 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 27 Jan 2012 09:42:45 +0100 Subject: Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV attack countermeasure. --- Misc/NEWS | 3 +++ Modules/_ssl.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 8804d79..92e8197 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Core and Builtins Library ------- +- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC + IV attack countermeasure. + What's New in Python 2.6.7? =========================== diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 4619cda..46f71e8 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -357,7 +357,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) -- cgit v0.12