The branch, master has been updated
via 56d9c8c wafsamba: Make sure md5 is really work before using it or
overriding the hash function
from b4ae73f samba-tool processes: Make the output a bit neater
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5
Author: Alexander Bokovoy <[email protected]>
Date: Fri Dec 7 17:36:02 2012 +0200
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 <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Sat Dec 8 13:30:07 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_utils.py | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index c1869df..cab87a4 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')
--
Samba Shared Repository
