Skip to content

gh-80665: Enable all 5 TLSv1.3 cipher suites by default #156855

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

gh-80665: Enable all 5 TLSv1.3 cipher suites by default #156855

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
15 changes: 15 additions & 0 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ extern const SSL_METHOD *TLSv1_2_method(void);
#ifndef PY_SSL_DEFAULT_CIPHER_STRING
#error "Py_SSL_DEFAULT_CIPHERS 0 needs Py_SSL_DEFAULT_CIPHER_STRING"
#endif
#ifndef PY_SSL_DEFAULT_CIPHERSUITES
#define PY_SSL_DEFAULT_CIPHERSUITES TLS_DEFAULT_CIPHERSUITES
#endif
#ifndef PY_SSL_MIN_PROTOCOL
#define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION
#endif
Expand All @@ -169,12 +172,15 @@ extern const SSL_METHOD *TLSv1_2_method(void);
* https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
*/
#define PY_SSL_DEFAULT_CIPHER_STRING "@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM"
/* Select all 5 TLSv1.3 cipher suites */
#define PY_SSL_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_SHA256:TLS_AES_128_CCM_8_SHA256"
#ifndef PY_SSL_MIN_PROTOCOL
#define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION
#endif
#elif PY_SSL_DEFAULT_CIPHERS == 2
/* Ignored in SSLContext constructor, only used to as _ssl.DEFAULT_CIPHER_STRING */
#define PY_SSL_DEFAULT_CIPHER_STRING SSL_DEFAULT_CIPHER_LIST
#define PY_SSL_DEFAULT_CIPHERSUITES TLS_DEFAULT_CIPHERSUITES
#else
#error "Unsupported PY_SSL_DEFAULT_CIPHERS"
#endif
Expand Down Expand Up @@ -3145,6 +3151,15 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
"No cipher can be selected.");
goto error;
}
/* TLSv1.3 ciphersuites */
result = SSL_CTX_set_ciphersuites(ctx, PY_SSL_DEFAULT_CIPHERSUITES);
if (result == 0) {
Py_DECREF(self);
ERR_clear_error();
PyErr_SetString(get_state_ctx(self)->PySSLErrorObject,
"No ciphersuite can be selected.");
goto error;
}
#ifdef PY_SSL_MIN_PROTOCOL
switch(proto_version) {
case PY_SSL_VERSION_TLS:
Expand Down
Loading