Skip to content

bpo-32257: [SSL] Support Disabling Renegotiation #4762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ex172000 wants to merge 1 commit into from
Closed

bpo-32257: [SSL] Support Disabling Renegotiation #4762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,9 @@ def load_default_certs(self, purpose=Purpose.SERVER_AUTH):
self._load_windows_store_certs(storename, purpose)
self.set_default_verify_paths()

def disable_renegotiation(self):
self.options |= getattr(_ssl, "FLAGS_NO_RENEGOTIATE_CIPHERS", 0)


def create_default_context(purpose=Purpose.SERVER_AUTH, cafile=None,
capath=None, cadata=None):
Expand Down
10 changes: 10 additions & 0 deletions Misc/NEWS.d/2.7.14rc1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,13 @@ Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms up
caches, create explicitly all internal singletons which are created on
demand to prevent false positives when checking for reference leaks.
(:issue:`30675`).

..

.. bpo: 32755
.. date: 2017-12-08-23-11-15
.. nonce: 8NV5fa
.. section: Library

Adding a new method in SSLContext so that we can disable renegotiation
easier. This resolves CVE-2009-3555 and attack demonstrated by thc-ssl-dos.
6 changes: 6 additions & 0 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4297,6 +4297,12 @@ init_ssl(void)
PyModule_AddIntConstant(m, "OP_NO_COMPRESSION",
SSL_OP_NO_COMPRESSION);
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
PyModule_AddIntConstant(m, "FLAGS_NO_RENEGOTIATE_CIPHERS",
SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS);
#endif
#endif

#if HAVE_SNI
r = Py_True;
Expand Down