[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  f8363dd crypto: fix build on OS X
       via  af5102f build: test the generic md5 function after importing it from hashlib
      from  8e5f4ea libgpo: apply some const.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f8363dd22a67108022bc0fe95003450f79057f7d
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jan 7 15:55:57 2014 +0100

    crypto: fix build on OS X
    
    we also need to use the CC_MD5_CTX from CommonCrypto here instead of the MD5_CTX
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Jan  8 08:12:29 CET 2014 on sn-devel-104

commit af5102fe0075520d62beba412c994d4a74f5446b
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jan 7 15:55:56 2014 +0100

    build: test the generic md5 function after importing it from hashlib
    
    otherwise we used the one from md5 which lead to the following warning on SerNet-imini:
    
    the md5 module is deprecated; use hashlib instead import md5
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_utils.py |    2 +-
 lib/crypto/md5.h                   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index c1ac7e2..0b0bb48 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -391,7 +391,7 @@ try:
     # 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')
+    foo = md5('abcd')
 except:
     try:
         import md5
diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h
index edae27f..ec6128e 100644
--- a/lib/crypto/md5.h
+++ b/lib/crypto/md5.h
@@ -18,6 +18,7 @@
 #elif defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
 #include <CommonCrypto/CommonDigest.h>
 
+#define MD5_CTX					CC_MD5_CTX
 #define MD5Init(c)					CC_MD5_Init(c)
 #define MD5Update(c,d,l)			CC_MD5_Update(c,d,l)
 #define MD5Final(m, c)				CC_MD5_Final((unsigned char *)m,c)


-- 
Samba Shared Repository