diff options
| -rw-r--r-- | lib/crypto/md5.h | 12 | ||||
| -rw-r--r-- | lib/crypto/wscript_build | 2 | ||||
| -rw-r--r-- | lib/crypto/wscript_configure | 2 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/configure.in | 7 |
5 files changed, 23 insertions, 2 deletions
diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h index bcdf50c000..388cdf83f0 100644 --- a/lib/crypto/md5.h +++ b/lib/crypto/md5.h @@ -10,6 +10,16 @@ /* Try to avoid clashes with BSD MD5 implementation */ #include <bsd/md5.h> #else +/* Try to use CommonCrypto on Mac as otherwise we can get MD5Final twice */ +#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H +#include <CommonCrypto/CommonDigest.h> + +#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) +#define MD5Context CC_MD5state_st + +#else typedef struct MD5Context { uint32_t buf[4]; uint32_t bits[2]; @@ -22,6 +32,8 @@ 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_COMMONCRYPTO_COMMONDIGEST_H */ + #endif /* HAVE_BSD_MD5_H */ #endif /* !MD5_H */ diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build index f50269879b..849bf1664e 100644 --- a/lib/crypto/wscript_build +++ b/lib/crypto/wscript_build @@ -4,7 +4,7 @@ extra_source = '' extra_deps = '' if bld.CONFIG_SET('HAVE_BSD_MD5_H'): extra_deps += ' bsd' -else: +elif not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'): extra_source += ' md5.c' bld.SAMBA_SUBSYSTEM('LIBCRYPTO', diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure index 77d21e9795..5fc00fb22c 100644 --- a/lib/crypto/wscript_configure +++ b/lib/crypto/wscript_configure @@ -1,2 +1,4 @@ conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', checklibc=True) +conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', + checklibc=True) diff --git a/source3/Makefile.in b/source3/Makefile.in index 5fcf8598e3..acd47b7467 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -422,7 +422,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \ ../lib/util/blocking.o ../lib/util/rfc1738.o \ ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o -CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \ +CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \ ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \ ../lib/crypto/md4.o \ ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \ diff --git a/source3/configure.in b/source3/configure.in index 3736dcbedb..e0fe79c9d0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -750,12 +750,19 @@ AC_CHECK_HEADERS(xfs/libxfs.h) AC_CHECK_HEADERS(netgroup.h) AC_CHECK_HEADERS(linux/falloc.h) AC_CHECK_HEADERS(sys/uuid.h) +AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h) AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ #if HAVE_RPC_RPC_H #include <rpc/rpc.h> #endif ]]) +CRYPTO_MD5_OBJ= +if test "x$ac_cv_header_CommonCrypto_CommonDigest_h" != "xyes" +then + CRYPTO_MD5_OBJ="../lib/crypto/md5.o" +fi +AC_SUBST(CRYPTO_MD5_OBJ) ## These fail to compile on IRIX so just check for their presence AC_CHECK_HEADERS(sys/mode.h,,,) |