diff options
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index cab87a4dbb..c1ac7e29b2 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -388,17 +388,16 @@ def RUN_COMMAND(cmd, # make sure we have md5. some systems don't have it try: from hashlib import md5 - try: - foo = md5.md5('abcd') - except ValueError: - raise + # Even if hashlib.md5 exists, it may be unusable. + # Try to use MD5 function. In FIPS mode this will cause an exception + # and we'll get to the replacement code + foo = md5.md5('abcd') except: try: import md5 - try: - foo = md5.md5('abcd') - except ValueError: - raise + # repeat the same check here, mere success of import is not enough. + # Try to use MD5 function. In FIPS mode this will cause an exception + foo = md5.md5('abcd') except: import Constants Constants.SIG_NIL = hash('abcd') |