Attachment 8312 Details for Bug 9479 – v4-0-test patch

[patch] v4-0-test patch

0001-wafsamba-Make-sure-md5-is-really-work-before-using-i.patch (text/plain), 1.50 KB, created by Andreas Schneider on 2012-12-08 13:06:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2012-12-08 13:06:27 UTC

Size: 1.50 KB

patch

obsolete

>From 26209e1abd0614c541ffd29d04490a4dafb52408 Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <ab@samba.org>
>Date: Fri, 7 Dec 2012 17:36:02 +0200
>Subject: [PATCH] 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>
>---
> buildtools/wafsamba/samba_utils.py | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>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')
>-- 
>1.8.0.1
>

Actions: View

Attachments on bug 9479: 8303 | 8307 | 8312