From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "David Aguilar" <davvid@gmail.com>,
"Git List" <git@vger.kernel.org>,
"Torsten Bögershausen" <tboegi@web.de>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH v8 2/3] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
Date: Sun, 19 May 2013 06:23:35 -0400 [thread overview]
Message-ID: <1368959016-23146-3-git-send-email-sunshine@sunshineco.com> (raw)
In-Reply-To: <1368959016-23146-1-git-send-email-sunshine@sunshineco.com>
From: David Aguilar <davvid@gmail.com>
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 <davvid@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Makefile b/Makefile
index cd24c94..5e7cadf 100644
--- a/Makefile
+++ b/Makefile
@@ -1397,10 +1397,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 = <CommonCrypto/CommonDigest.h>
+else
SHA1_HEADER = <openssl/sha.h>
EXTLIBS += $(LIB_4_CRYPTO)
endif
endif
+endif
+
ifdef NO_PERL_MAKEMAKER
export NO_PERL_MAKEMAKER
endif
--
1.8.2.3
next prev parent reply other threads:[~2013-05-19 10:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-19 10:23 [PATCH v8 0/3] Begin replacing OpenSSL with CommonCrypto Eric Sunshine
2013-05-19 10:23 ` [PATCH v8 1/3] Makefile: add support for Apple CommonCrypto facility Eric Sunshine
2013-05-19 10:23 ` Eric Sunshine [this message]
2013-05-19 10:23 ` [PATCH v8 3/3] imap-send: eliminate HMAC deprecation warnings on Mac OS X Eric Sunshine
2013-05-20 22:52 ` [PATCH v8 0/3] Begin replacing OpenSSL with CommonCrypto Junio C Hamano
2013-05-21 19:19 ` Torsten Bögershausen
2013-05-21 19:36 ` Jonathan Nieder
2013-05-21 22:39 ` David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368959016-23146-3-git-send-email-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox