Skip to content

Commit 6106795

Browse files
davvidgitster
authored andcommitted
cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
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 <CommonCrypto/CommonDigest.h> to provide compatibility macros associating OpenSSL SHA-1 functions with their CommonCrypto counterparts. [es: reworded commit message] Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4dcd773 commit 6106795

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,11 +1396,17 @@ ifdef PPC_SHA1
13961396
SHA1_HEADER = "ppc/sha1.h"
13971397
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
13981398
LIB_H += ppc/sha1.h
1399+
else
1400+
ifdef APPLE_COMMON_CRYPTO
1401+
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
1402+
SHA1_HEADER = <CommonCrypto/CommonDigest.h>
13991403
else
14001404
SHA1_HEADER = <openssl/sha.h>
14011405
EXTLIBS += $(LIB_4_CRYPTO)
14021406
endif
14031407
endif
1408+
endif
1409+
14041410
ifdef NO_PERL_MAKEMAKER
14051411
export NO_PERL_MAKEMAKER
14061412
endif

0 commit comments

Comments
 (0)