From: Eric Sunshine Date: Sat, 18 May 2013 00:32:37 GMT Subject: [PATCH v7 2/3] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Message-ID: <1368837158-13915-3-git-send-email-sunshine@sunshineco.com> In-Reply-To: <1368837158-13915-1-git-send-email-sunshine@sunshineco.com> From: David Aguilar As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to OpenSSL ABI instability, thus leading to build diagnostics such as: warning: 'SHA1_Init' is deprecated (declared at /usr/include/openssl/sha.h:121) Silence the warnings by using Apple's CommonCrypto SHA-1 replacement functions for SHA1_Init(), SHA1_Update(), and SHA1_Final(). COMMON_DIGEST_FOR_OPENSSL is defined to instruct to provide compatibility macros associating OpenSSL SHA-1 functions with their CommonCrypto counterparts. [es: reworded commit message] Signed-off-by: David Aguilar Signed-off-by: Eric Sunshine --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 2178c2c..7a03fe9 100644 --- a/Makefile +++ b/Makefile @@ -1398,10 +1398,16 @@ ifdef PPC_SHA1 LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o LIB_H += ppc/sha1.h else +ifdef APPLE_COMMON_CRYPTO + COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL + SHA1_HEADER = +else SHA1_HEADER = EXTLIBS += $(LIB_4_CRYPTO) endif endif +endif + ifdef NO_PERL_MAKEMAKER export NO_PERL_MAKEMAKER endif -- 1.8.2.3