Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV attack countermeasure.

This commit is contained in:
Antoine Pitrou 2012-01-27 09:42:45 +01:00
parent 141e770e8f
commit d358e0554b
2 changed files with 5 additions and 1 deletions

View file

@ -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?
===========================

View file

@ -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)