gh-136547: refactor hashlib_helper for blocking and requesting digests
#136762
+545
−295
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
picnixz
commented
Jul 18, 2025
picnixz
commented
Jul 19, 2025
picnixz
commented
Jul 19, 2025
| # re-import '_hashlib' in case it was mocked | ||
| _hashlib = try_import_module("_hashlib") | ||
| mod = _hashlib if openssl and _hashlib is not None else hashlib | ||
| constructor = partial(mod.new, digestname, **kwargs) |
There was a problem hiding this comment.
I shouldn't return a partial function with "**kwargs" as it makes it impossible to use otherwise. I should only check if the call will succeed if I were to pass such keywords.
| _hashlib = importlib.import_module("_hashlib") | ||
| except ImportError as exc: | ||
| raise SkipNoHash(digestname, "openssl") from exc | ||
| constructor = partial(_hashlib.new, digestname, **kwargs) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I made some mistakes in my previous PR and the design I introduced for requesting hashes could actually be greatly simplified. As those two are tightly coupled, I've decided to do both the fix & refactoring at the same time.
Because of all build possibilities we can have, whether at runtime or not, and because some functions can't be given
usedforsecurity, tests easily fail because of the underlying configurations. Default builds where we don't have some FIPS module are easy to test, but when FIPS mode is enabled, it's hard to know what is blocked and what is not.One really annoying thing is the treatment of BLAKE-2 which always falls back to the built-in implementations. Thus, blocking BLAKE-2 may be quite hard and quite different. Well, if we block BLAKE-2 and we don't have OpenSSL at all, then tests don't pass because hashlib.py can't even be imported. Anywsay, I'm opening a draft for now and I'll continue working on this tomorrow.