summaryrefslogtreecommitdiff
path: root/imap-send.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-05-19 06:23:36 -0400
committerJunio C Hamano <gitster@pobox.com>2013-05-21 13:26:37 -0700
commitbe4c828b761a7c65edcff75b008051b6d027e64a (patch)
tree978af823dd493c2a43092dcc1a20140a076fd993 /imap-send.c
parent61067954ce166e8a6fbcd109376fe2d9681ca333 (diff)
downloadgit-be4c828b761a7c65edcff75b008051b6d027e64a.tar.gz
imap-send: eliminate HMAC deprecation warnings on Mac OS X
As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to OpenSSL ABI instability. Silence the warnings by using Apple's CommonCrypto HMAC replacement functions. [es: reworded commit message; check APPLE_COMMON_CRYPTO instead of abusing COMMON_DIGEST_FOR_OPENSSL] Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'imap-send.c')
-rw-r--r--imap-send.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/imap-send.c b/imap-send.c
index d9bcfb44dc..d6b65e204c 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -29,8 +29,18 @@
#ifdef NO_OPENSSL
typedef void *SSL;
#else
+#ifdef APPLE_COMMON_CRYPTO
+#include <CommonCrypto/CommonHMAC.h>
+#define HMAC_CTX CCHmacContext
+#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len)
+#define HMAC_Update CCHmacUpdate
+#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash)
+#define HMAC_CTX_cleanup(ignore)
+#define EVP_md5() kCCHmacAlgMD5
+#else
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#endif
#include <openssl/x509v3.h>
#endif