-
-
Notifications
You must be signed in to change notification settings - Fork 33k
gh-138252: Add support in SSL module for getting and setting TLS signature algorithms #138269
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.
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
Conversation
Hrm. The "AWS-LC" build failure seems to relate to it not finding the function SSL_CTX_set1_client_sigalgs_list. However, I don't see any sign of that only being in more recent OpenSSL releases. Is there something unusual about the version of OpenSSL used there? |
Ah - I see AWS-LC combines code from BoringSSL and OpenSSL. I guess we'll need to find some way to detect AWS-LC and raise an exception if the call to set the client sigalgs is used, at least for whatever version of AWS-LC triggered this failure. |
I looked through the AWS-LC code and can confirm it doesn't appear to support SSL_CTX_set1_client_sigalgs_list, even in the latest version. However, I'm not really sure how in the code to test for AWS-LC at build time or run time (either in the main SSL module or in the unit tests). I found some references claiming OPENSSL_IS_AWSLC should exist as a preprocessor symbol, but I don't see any evidence of that being used in CPython at the moment. |
I decided to go ahead and code up an >>> import ssl
>>> ssl.get_sigalgs()
['ecdsa_secp256r1_sha256', 'ecdsa_secp384r1_sha384', 'ecdsa_secp521r1_sha512',
'ed25519', 'ed448', 'ecdsa_sha224', 'ecdsa_sha1', 'ecdsa_brainpoolP256r1tls13_sha256',
'ecdsa_brainpoolP384r1tls13_sha384', 'ecdsa_brainpoolP512r1tls13_sha512', 'rsa_pss_rsae_sha256',
'rsa_pss_rsae_sha384', 'rsa_pss_rsae_sha512', 'rsa_pss_pss_sha256', 'rsa_pss_pss_sha384',
'rsa_pss_pss_sha512', 'rsa_pkcs1_sha256', 'rsa_pkcs1_sha384', 'rsa_pkcs1_sha512', 'rsa_pkcs1_sha224',
'rsa_pkcs1_sha1', 'dsa_sha256', 'dsa_sha384', 'dsa_sha512', 'dsa_sha224', 'dsa_sha1'] It's not checked in yet, but I can do so if we decide to include it, at which point I'll go back and fill in docs and unit tests for it. It seems like it might be useful for a client/server to know the available signature algorithms that it can choose from, since it may vary depending on the OpenSSL implementation in use and what providers are loaded. Like |
As you observed, AWS-LC is a fork of BoringSSL & LibreSSL. We decided to try supporting other flavors of libssl implementations because it might come handy for some users that don't want to use OpenSSL.
If this is the case, I suggest one of the following to do:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. You could refactor server_sigalg
and client_sigalg
into a single function as follows:
static PyObject *
ssl_socket_signame_impl(PySSLSocket *socket,
enum py_ssl_server_or_client self_socket_type)
{
#if OPENSSL_VERSION_NUMBER >= 0x30500000L
int ret;
const char *sigalg;
if (socket->ssl == NULL) {
Py_RETURN_NONE;
}
ret = (socket->socket_type == self_socket_type)
? SSL_get0_signature_name(socket->ssl, &sigalg)
: SSL_get0_peer_signature_name(socket->ssl, &sigalg);
if (ret == 0) {
Py_RETURN_NONE;
}
return PyUnicode_DecodeFSDefault(sigalg);
#else
PyErr_SetString(PyExc_NotImplementedError,
"Getting sig algorithms requires OpenSSL 3.5 or later.");
return NULL;
#endif
}
and then implement:
static PyObject *
_ssl__SSLSocket_client_sigalg_impl(PySSLSocket *self)
{
return ssl_socket_signame_impl(self, PY_SSL_CLIENT);
}
static PyObject *
_ssl__SSLSocket_server_sigalg_impl(PySSLSocket *self)
{
return ssl_socket_signame_impl(self, PY_SSL_SERVER);
}
Misc/NEWS.d/next/Library/2025-08-30-17-58-04.gh-issue-138252.CDiEby.rst
Outdated
Show resolved
Hide resolved
I was able to get OPENSSL_IS_AWSLC to work here. I used that in the SSL module and then used the following in the unit tests (with skipUnless):
With that, the tests are all passing. |
@picnixz, any thoughts on the proposed ssl.get_sigalgs() function? Should I go ahead and finish the work on that? |
I had some time this weekend, so I've gone ahead and added support for |
The failure here appears to be in whatsnew/3.15.pst not being able to see the new Any idea what might be happening here? Do I need an explicit import somewhere? I don't see any such thing for other module references in whatsnew. |
@picnixz, Anything further you'd like me to change? I think I've covered all the current review comments. |
No I think we're good. I'll have a final check tomorrow, and if needed, directly commit to your branch, and then merge it. |
Would it be possible to mention the OpenSSL version requirements in the documentation? |
That's what I plan to do (I'm actually working on it now): #138633. |
…S signature algorithms (python#138269) The signature algorithms allowed for certificate-based client authentication or for the server to complete the TLS handshake can be defined on a SSL context via `ctx.set_client_sigalgs()` and `ctx.set_server_sigalgs()`. With OpenSSL 3.4 or later, the list of available TLS algorithms can be retrieved by `ssl.get_sigalgs()`. With OpenSSL 3.5 or later, the selected signature algorithms can be retrieved from SSL sockets via `socket.client_sigalg()` and `socket.server_sigalg()`. This commit also partially amends 377b787 by using `PyUnicode_DecodeFSDefault` instead of `PyUnicode_DecodeASCII` in `_ssl._SSLContext.get_groups`, so that functions consistently decode strings obtained from OpenSSL. --------- Co-authored-by: Bénédikt Tran <[email protected]>
📚 Documentation preview 📚: https://cpython-previews--138269.org.readthedocs.build/