From 484ab42f440070c0369b81f5c69da860fa47a798 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 6 Oct 2022 16:53:22 -0500 Subject: utils/ply: Update md5 to better report errors with hashlib In the case where hashlib is not available, the try would fail and fall through resulting in a backtrace on the usage of the 'sig'. The backtrace itself was confusing and made it difficult to determine what went wrong. Update the import to be in it's own try block with an appropriate message to indicate what went wrong. Note, the current version of ply all of this code has been restructured so this is not applicable upstream. Additionally, some versions of hashlib don't appear to implement the second FIPS related argument. Detect this and support both versions. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Luca Ceresoli --- lib/bb/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/bb/utils.py') diff --git a/lib/bb/utils.py b/lib/bb/utils.py index e6e21e20f..64a004d0d 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -547,7 +547,12 @@ def md5_file(filename): Return the hex string representation of the MD5 checksum of filename. """ import hashlib - return _hasher(hashlib.new('MD5', usedforsecurity=False), filename) + try: + sig = hashlib.new('MD5', usedforsecurity=False) + except TypeError: + # Some configurations don't appear to support two arguments + sig = hashlib.new('MD5') + return _hasher(sig, filename) def sha256_file(filename): """ -- cgit 1.2.3-korg