diff options
| author | Nick Zitzmann <nick@chronosnet.com> | 2012-10-16 11:48:55 -0600 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-10-22 23:32:59 +0200 |
| commit | 94891ff296c31c02a3fe8fcdc8da3b9be493fac9 (patch) | |
| tree | 31c8c94a1ae95999be9084a062ab73eec929fd59 | |
| parent | 12a40e17a9aa274e63aff0c8457b0298f959efc6 (diff) | |
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.
| -rw-r--r-- | lib/md5.c | 11 | ||||
| -rw-r--r-- | src/tool_metalink.c | 8 |
2 files changed, 15 insertions, 4 deletions
@@ -84,6 +84,17 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx) # include <md5.h> # 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 <CommonCrypto/CommonDigest.h> + #elif defined(_WIN32) #include <wincrypt.h> 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. */ |