gh-103256: Fix hmac algorithm to support fallback implementation (gh-103286)

miss-islington · corona10 · gpshead · web-flow · commit 8740fd855cea · 2023-04-06T19:27:46.000-07:00
(cherry picked from commit efb0a2c) Co-authored-by: Dong-hee Na <donghee.na@python.org> Co-authored-by: Gregory P. Smith <greg@krypto.org>
diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py
@@ -373,6 +373,16 @@ def test_with_digestmod_no_default(self):
         with self.assertRaisesRegex(TypeError, r'required.*digestmod'):
             hmac.HMAC(key, msg=data, digestmod='')
 
+    def test_with_fallback(self):
+        cache = getattr(hashlib, '__builtin_constructor_cache')
+        try:
+            cache['foo'] = hashlib.sha256
+            hexdigest = hmac.digest(b'key', b'message', 'foo').hex()
+            expected = '6e9ef29b75fffc5b7abae527d58fdadb2fe42e7219011976917343065f58ed4a'
+            self.assertEqual(hexdigest, expected)
+        finally:
+            cache.pop('foo')
+
 
 class ConstructorTestCase(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/Library/2023-04-06-17-28-36.gh-issue-103256.1syxfs.rst b/Misc/NEWS.d/next/Library/2023-04-06-17-28-36.gh-issue-103256.1syxfs.rst
@@ -0,0 +1,6 @@
+Fixed a bug that caused :mod:`hmac` to raise an exception when the requested
+hash algorithm was not available in OpenSSL despite being available
+separately as part of ``hashlib`` itself.  It now falls back properly to the
+built-in. This could happen when, for example, your OpenSSL does not include
+SHA3 support and you want to compute ``hmac.digest(b'K', b'M',
+'sha3_256')``.
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -360,7 +360,7 @@ py_digest_by_name(PyObject *module, const char *name, enum Py_hash_type py_ht)
         }
     }
     if (digest == NULL) {
-        _setException(PyExc_ValueError, "unsupported hash type %s", name);
+        _setException(state->unsupported_digestmod_error, "unsupported hash type %s", name);
         return NULL;
     }
     return digest;

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ py_digest_by_name(PyObject module, const char name, enum Py_hash_type py_ht)`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`if (digest == NULL) {`
`363`		`- _setException(PyExc_ValueError, "unsupported hash type %s", name);`
	`363`	`+ _setException(state->unsupported_digestmod_error, "unsupported hash type %s", name);`
`364`	`364`	`return NULL;`
`365`	`365`	`}`
`366`	`366`	`return digest;`