From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org, "Jonathan Nieder" <jrnieder@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
Date: Wed, 15 May 2013 17:36:20 -0700 [thread overview]
Message-ID: <7vbo8bahh7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1368663120-47102-1-git-send-email-davvid@gmail.com> (David Aguilar's message of "Wed, 15 May 2013 17:11:59 -0700")
David Aguilar <davvid@gmail.com> writes:
> Mac OS X 10.8 Mountain Lion prints warnings when building git:
>
> warning: 'SHA1_Init' is deprecated
> (declared at /usr/include/openssl/sha.h:121)
>
> Silence the warnings by using the CommonCrytpo SHA-1
> functions for SHA1_Init(), SHA1_Update(), and SHA1_Final().
>
> Add a NO_COMMON_DIGEST_FOR_OPENSSL option to the Makefile to allow
> users to opt out of using this library. When defined, Git will
> use OpenSSL instead.
>
> COMMON_DIGEST_FOR_OPENSSL is defined to enable the OpenSSL
> compatibility macros in CommonDigest.h.
This symbol will also cover not just SHA but also HMAC, would it
make more sense to call it COMMON_CRYPTO_FOR_OPENSSL? After all,
that is what Apple calls this library, no?
>
> Helped-by: Eric Sunshine <sunshine@sunshineco.com>
> Helped-by: Torsten Bögershausen <tboegi@web.de>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> Changes since last time:
>
> Name the Makefile variable after the #define for consistency.
>
> Makefile | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index f698c1a..b0eb949 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -137,6 +137,10 @@ all::
> # specify your own (or DarwinPort's) include directories and
> # library directories by defining CFLAGS and LDFLAGS appropriately.
> #
> +# Define NO_COMMON_DIGEST_FOR_OPENSSL if you are building on Darwin/Mac OS X
> +# and do not want to use Apple's CommonCrypto library. This allows you to
> +# provide your own OpenSSL library, for example from MacPorts.
> +#
> # Define BLK_SHA1 environment variable to make use of the bundled
> # optimized C SHA1 routine.
> #
> @@ -1054,6 +1058,9 @@ ifeq ($(uname_S),Darwin)
> BASIC_LDFLAGS += -L/opt/local/lib
> endif
> endif
> + ifndef NO_COMMON_DIGEST_FOR_OPENSSL
> + COMMON_DIGEST_FOR_OPENSSL = YesPlease
> + endif
> NO_REGEX = YesPlease
> PTHREAD_LIBS =
> endif
> @@ -1389,10 +1396,16 @@ ifdef PPC_SHA1
> LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
> LIB_H += ppc/sha1.h
> else
> +ifdef COMMON_DIGEST_FOR_OPENSSL
> + BASIC_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
next prev parent reply other threads:[~2013-05-16 0:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 0:11 [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X David Aguilar
2013-05-16 0:12 ` [PATCH v6 2/2] imap-send: eliminate HMAC " David Aguilar
2013-05-16 0:39 ` Junio C Hamano
2013-05-16 3:28 ` David Aguilar
2013-05-16 4:53 ` Junio C Hamano
2013-05-16 0:36 ` Junio C Hamano [this message]
2013-05-16 3:31 ` [PATCH v6 1/2] cache.h: eliminate SHA-1 " 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=7vbo8bahh7.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.