From 94891ff296c31c02a3fe8fcdc8da3b9be493fac9 Mon Sep 17 00:00:00 2001 From: Nick Zitzmann Date: Tue, 16 Oct 2012 11:48:55 -0600 Subject: [PATCH] metalink/md5: Use CommonCrypto on Apple operating systems Previously the Metalink code used Apple's CommonCrypto library only if curl was built using the --with-darwinssl option. Now we use CommonCrypto on all Apple operating systems including Tiger or later, or iOS 5 or later, so you don't need to build --with-darwinssl anymore. Also rolled out this change to libcurl's md5 code. --- lib/md5.c | 11 +++++++++++ src/tool_metalink.c | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/md5.c b/lib/md5.c index ada2d37e6..8e580d8e4 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -84,6 +84,17 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx) # include # endif +#elif defined(__MAC_10_4) || defined(__IPHONE_5_0) + +/* For Apple operating systems: CommonCrypto has the functions we need. + The library's headers are even backward-compatible with OpenSSL's + headers as long as we define COMMON_DIGEST_FOR_OPENSSL first. + + These functions are available on Tiger and later, as well as iOS 5.0 + and later. If you're building for an older cat, well, sorry. */ +# define COMMON_DIGEST_FOR_OPENSSL +# include + #elif defined(_WIN32) #include diff --git a/src/tool_metalink.c b/src/tool_metalink.c index cafa63fdf..16689a3c2 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -52,10 +52,10 @@ # define MD5_CTX gcry_md_hd_t # define SHA_CTX gcry_md_hd_t # define SHA256_CTX gcry_md_hd_t -#elif defined(USE_DARWINSSL) -/* For darwinssl: CommonCrypto has the functions we need. The library's - headers are even backward-compatible with OpenSSL's headers as long as - we define COMMON_DIGEST_FOR_OPENSSL first. +#elif defined(__MAC_10_4) || defined(__IPHONE_5_0) +/* For Apple operating systems: CommonCrypto has the functions we need. + The library's headers are even backward-compatible with OpenSSL's + headers as long as we define COMMON_DIGEST_FOR_OPENSSL first. These functions are available on Tiger and later, as well as iOS 5.0 and later. If you're building for an older cat, well, sorry. */