From: Alexander Bokovoy <ab@samba.org>
Date: Fri, 7 Dec 2012 15:36:02 +0000 (+0200)
Subject: wafsamba: Make sure md5 is really work before using it or overriding the hash function
X-Git-Tag: samba-4.0.0~73
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=91d27520dfec5817e2e3e6826f7c7aa2ed42319b;p=samba.git

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
(cherry picked from commit 56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5)

Signed-off-by: Andreas Schneider <asn@samba.org>

Fix bug #9479 - Support FIPS mode when building Samba.
---

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index c1869df1c26..cab87a4dbba 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')