Skip to content

bpo-31453: [WIP] Allow to change TLS protocols on Debian #3662

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
tiran wants to merge 1 commit into from
Closed

bpo-31453: [WIP] Allow to change TLS protocols on Debian #3662

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
bpo-31453: Allow to change TLS protocols on Debian 
Undo Debian Unstable's patching for SSL_CTX. Allow all protocols with
SSL_CTX_set_min_proto_version() again so they can be enabled and disabled
with SSL_CTX_set_options(). The set_min_proto_version is not supported by
Python, set_options is available as SSLContext.options.

Signed-off-by: Christian Heimes <christian@python.org>
  • Loading branch information
@tiran
tiran committed Sep 19, 2017
commit 7f864ff57fcccbb9c6aa8b5de0c750d54360bea2
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2017-09-19-21-06-23.bpo-31453.obElH-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Undo Debian Unstable's patching for SSL_CTX. Allow all protocols with
SSL_CTX_set_min_proto_version() again so they can be enabled and disabled
with SSL_CTX_set_options(). The set_min_proto_version is not supported by
Python, set_options is available as SSLContext.options.
28 changes: 28 additions & 0 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2746,6 +2746,34 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
return NULL;
}

#ifdef SSL_CTX_set_min_proto_version
/* Workaround for Debian's OpenSSL patch
*
* Debian disables SSL 3.0, TLS 1.0, and TLS 1.1 by default. Python
* does not expose the new OpenSSL 1.1 API that is required to
* re-enable the old protocols. Documentation also promises that
* PROTOCOL_TLS has TLS 1.0 and 1.1 enabled and SSLv3 can be enabled
* by changing SSLContext.options.
*/
if ((proto_version == PY_SSL_VERSION_TLS) ||
(proto_version == PY_SSL_VERSION_TLS_CLIENT) ||
(proto_version == PY_SSL_VERSION_TLS_SERVER)) {
#if !defined(OPENSSL_NO_SSL3)
result = SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
#elif !defined(OPENSSL_NO_TLS1)
result = SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
#elif !defined(OPENSSL_NO_TLS1_1)
result = SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
#else
result = 1;
#endif
if (result == 0) {
_setSSLError(NULL, 0, __FILE__, __LINE__);
return NULL;
}
}
#endif /* SSL_CTX_set_min_proto_version */

assert(type != NULL && type->tp_alloc != NULL);
self = (PySSLContext *) type->tp_alloc(type, 0);
if (self == NULL) {
Expand Down