diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-12-07 17:36:02 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2012-12-08 13:30:07 +0100 |
| commit | 56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5 (patch) | |
| tree | 1d9cbd779a6e1d6e64ae558b5bc7ee98bcf86640 /buildtools/wafsamba | |
| parent | b4ae73f58c48b3502147332ee4c72621867fffb3 (diff) | |
| download | samba-56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5.tar.gz samba-56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5.tar.bz2 samba-56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5.zip | |
wafsamba: Make sure md5 is really work before using it or overriding the hash function
In FIPS mode importing md5 Python module will not cause any error but calling md5.md5()
function will throw ValueError since md5 is not available.
Make sure md5.md5() actually works and if not, fall back to use hash replacement that
we already have in wafsamba.
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Sat Dec 8 13:30:07 CET 2012 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index c1869df1c2..cab87a4dbb 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -388,9 +388,17 @@ 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 except: try: import md5 + try: + foo = md5.md5('abcd') + except ValueError: + raise except: import Constants Constants.SIG_NIL = hash('abcd') |