diff options
| author | Matthieu Patou <mat@matws.net> | 2012-03-12 16:21:28 -0700 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2012-03-14 06:52:27 +0100 |
| commit | b68f72c7f58c05870100d0d993c9baf0fa80a891 (patch) | |
| tree | 0853da0922a85295e57c2d617548e4da4143cb1d /lib | |
| parent | 6dea4f24dc023a8234de01bbdcd012df29d3abf9 (diff) | |
| download | samba-b68f72c7f58c05870100d0d993c9baf0fa80a891.tar.gz samba-b68f72c7f58c05870100d0d993c9baf0fa80a891.tar.bz2 samba-b68f72c7f58c05870100d0d993c9baf0fa80a891.zip | |
lib/crypto: Detect CommonCrypto and use it if available
CommonCrypto/CommonDigest is available on Mac and there is function in
the libc for MD5 calculation. MD5Final is a C define of CC_MD5_Final.
Under some circumstance we have the symbol defined twice in samba
binaries on Snow Leopard at least.
By detecting CommonCrypto/CommonDigest we end up always using the system
version if available.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/md5.h | 12 | ||||
| -rw-r--r-- | lib/crypto/wscript_build | 2 | ||||
| -rw-r--r-- | lib/crypto/wscript_configure | 2 |
3 files changed, 15 insertions, 1 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) |