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 /source3/Makefile.in | |
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 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |