crypto: Use libbsd md5 header, if available.

diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h
index e61c27a73eb5b003aae242df40f5af92e7c0181d..bcdf50c0008669a47650ceef58d725c8b35a0bde 100644 (file)
--- a/lib/crypto/md5.h
+++ b/lib/crypto/md5.h
@@ -1,10 +1,15 @@
 #ifndef MD5_H
 #define MD5_H
+
 #ifndef HEADER_MD5_H
 /* Try to avoid clashes with OpenSSL */
 #define HEADER_MD5_H 
 #endif
 
+#ifdef HAVE_BSD_MD5_H
+/* Try to avoid clashes with BSD MD5 implementation */
+#include <bsd/md5.h>
+#else
 typedef struct MD5Context {
        uint32_t buf[4];
        uint32_t bits[2];
@@ -17,5 +22,6 @@ void MD5Init(MD5_CTX *context);
 void MD5Update(MD5_CTX *context, const uint8_t *buf,
               size_t len);
 void MD5Final(uint8_t digest[MD5_DIGEST_LENGTH], MD5_CTX *context);
+#endif /* HAVE_BSD_MD5_H */
 
 #endif /* !MD5_H */

diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index 7bc4eb7dd049616eded835bf31b3ae15787c42d1..6ad1cade98fb2a429e0b5cca9a751a3be5bcf40f 100644 (file)
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -1,8 +1,15 @@
 #!/usr/bin/env python
 
+extra_source = ''
+extra_deps = ''
+if bld.CONFIG_SET('HAVE_BSD_MD5_H'):
+       extra_deps += ' bsd'
+else:
+       extra_source += ' md5.c'
+
 bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
-       source='crc32.c md5.c hmacmd5.c md4.c arcfour.c sha256.c hmacsha256.c aes.c rijndael-alg-fst.c',
-       deps='talloc'
+       source='crc32.c hmacmd5.c md4.c arcfour.c sha256.c hmacsha256.c aes.c rijndael-alg-fst.c' + extra_source,
+       deps='talloc' + extra_deps
        )
 
 

diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure
new file mode 100644 (file)
index 0000000..77d21e9
--- /dev/null
+++ b/lib/crypto/wscript_configure
@@ -0,0 +1,2 @@
+conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
+    checklibc=True)

diff --git a/wscript b/wscript
index 18daaac08cdf9ba37f7949e109dacffaf7306142..9db278ca03e449e26756701011bc4d27767dea00 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -97,6 +97,7 @@ def configure(conf):
     conf.RECURSE('lib/popt')
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
+    conf.RECURSE('lib/crypto')
     conf.RECURSE('pidl')
     conf.RECURSE('selftest')
     conf.RECURSE('source3')