Skip to content

Commit

Permalink
bpo-47101: list only activated algorithms in hashlib.algorithms_avail…
Browse files Browse the repository at this point in the history
…able (GH-32076)
  • Loading branch information
tiran authored Mar 23, 2022
1 parent c62b944 commit 48e2010
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Lib/test/test_hashlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ def test_algorithms_guaranteed(self):
def test_algorithms_available(self):
self.assertTrue(set(hashlib.algorithms_guaranteed).
issubset(hashlib.algorithms_available))
# all available algorithms must be loadable, bpo-47101
self.assertNotIn("undefined", hashlib.algorithms_available)
for name in hashlib.algorithms_available:
digest = hashlib.new(name, usedforsecurity=False)

def test_usedforsecurity_true(self):
hashlib.new("sha256", usedforsecurity=True)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:const:`hashlib.algorithms_available` now lists only algorithms that are
provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are
not listed unless the legacy provider has been loaded into the default
OSSL context.
13 changes: 12 additions & 1 deletion Modules/_hashopenssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1836,15 +1836,21 @@ typedef struct _internal_name_mapper_state {

/* A callback function to pass to OpenSSL's OBJ_NAME_do_all(...) */
static void
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
_openssl_hash_name_mapper(EVP_MD *md, void *arg)
#else
_openssl_hash_name_mapper(const EVP_MD *md, const char *from,
const char *to, void *arg)
#endif
{
_InternalNameMapperState *state = (_InternalNameMapperState *)arg;
PyObject *py_name;

assert(state != NULL);
if (md == NULL)
// ignore all undefined providers
if ((md == NULL) || (EVP_MD_nid(md) == NID_undef)) {
return;
}

py_name = py_digest_name(md);
if (py_name == NULL) {
Expand All @@ -1870,7 +1876,12 @@ hashlib_md_meth_names(PyObject *module)
return -1;
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000L
// get algorithms from all activated providers in default context
EVP_MD_do_all_provided(NULL, &_openssl_hash_name_mapper, &state);
#else
EVP_MD_do_all(&_openssl_hash_name_mapper, &state);
#endif

if (state.error) {
Py_DECREF(state.set);
Expand Down

0 comments on commit 48e2010

Please sign in to comment.