From 3ef2bcad02efd6219f4ce599754c15e63b6af0dc Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 29 Jul 2013 18:28:30 -0700 Subject: 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 Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5e7cadf01..dddf49bd6 100644 --- a/Makefile +++ b/Makefile @@ -1398,6 +1398,7 @@ ifdef PPC_SHA1 LIB_H += ppc/sha1.h else ifdef APPLE_COMMON_CRYPTO + LIB_4_CRYPTO += -framework Security -framework CoreFoundation COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL SHA1_HEADER = else -- cgit v1.2.1 From c984938f9c454255012086e1203504dc243a59bd Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Mon, 5 Aug 2013 11:59:22 -0400 Subject: Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see 3ef2bca) so make sure that the appropriate libraries are always set. Signed-off-by: Brian Gernhardt Reviewed-by: Jeremy Huddleston Sequoia Signed-off-by: Junio C Hamano --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dddf49bd6..613b42f57 100644 --- a/Makefile +++ b/Makefile @@ -1167,6 +1167,9 @@ ifdef NEEDS_SSL_WITH_CRYPTO else LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto endif +ifdef APPLE_COMMON_CRYPTO + LIB_4_CRYPTO += -framework Security -framework CoreFoundation +endif endif ifdef NEEDS_LIBICONV ifdef ICONVDIR @@ -1398,7 +1401,6 @@ ifdef PPC_SHA1 LIB_H += ppc/sha1.h else ifdef APPLE_COMMON_CRYPTO - LIB_4_CRYPTO += -framework Security -framework CoreFoundation COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL SHA1_HEADER = else -- cgit v1.2.1