summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2013-07-30 01:28:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-30 15:53:24 (GMT)
commit3ef2bcad02efd6219f4ce599754c15e63b6af0dc (patch)
tree3f32ae410a875c7e3c07558cd0307da1cdbd108f /git-compat-util.h
parentbe4c828b761a7c65edcff75b008051b6d027e64a (diff)
downloadgit-3ef2bcad02efd6219f4ce599754c15e63b6af0dc.zip
git-3ef2bcad02efd6219f4ce599754c15e63b6af0dc.tar.gz
git-3ef2bcad02efd6219f4ce599754c15e63b6af0dc.tar.bz2
imap-send: use Apple's Security framework for base64 encoding
Use Apple's supported functions for base64 encoding instead of the deprecated OpenSSL functions. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index e955bb5..6ebb029 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -127,6 +127,17 @@
#else
#include <poll.h>
#endif
+
+#ifndef NO_OPENSSL
+#ifdef APPLE_COMMON_CRYPTO
+#include "compat/apple-common-crypto.h"
+#else
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif /* APPLE_COMMON_CRYPTO */
+#include <openssl/x509v3.h>
+#endif /* NO_OPENSSL */
+
#if defined(__MINGW32__)
/* pull in Windows compatibility stuff */
#include "compat/mingw.h"