# [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X 7 messages from 2013-05-16 to 2013-05-16. Participants: David Aguilar, Junio C Hamano. Thread: https://gitlist.dev/t/33830 ## David Aguilar, 2013-05-16 00:11 Subject: [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Message-ID: <1368663120-47102-1-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1368663120-47102-1-git-send-email-davvid%40gmail.com ``` 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. Helped-by: Eric Sunshine Helped-by: Torsten Bögershausen Signed-off-by: David Aguilar --- 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 = +else SHA1_HEADER = EXTLIBS += $(LIB_4_CRYPTO) endif endif +endif + ifdef NO_PERL_MAKEMAKER export NO_PERL_MAKEMAKER endif -- 1.8.3.rc2.3.g81576a6 ``` ## David Aguilar, 2013-05-16 00:12 Subject: [PATCH v6 2/2] imap-send: eliminate HMAC deprecation warnings on Mac OS X Message-ID: <1368663120-47102-2-git-send-email-davvid@gmail.com> URL: https://gitlist.dev/e/1368663120-47102-2-git-send-email-davvid%40gmail.com In-Reply-To: <1368663120-47102-1-git-send-email-davvid@gmail.com> ``` Mac OS X 10.8 Mountain Lion warns that HMAC_Init() and friends are deprecated. Detect the COMMON_CRYPTO_FOR_OPENSSL definition and use CommonCrypto's HMAC functions to eliminate the warnings. Signed-off-by: David Aguilar --- Changes since last time: None. imap-send.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/imap-send.c b/imap-send.c index d9bcfb4..96012b1 100644 --- a/imap-send.c +++ b/imap-send.c @@ -29,8 +29,18 @@ #ifdef NO_OPENSSL typedef void *SSL; #else +#ifdef COMMON_DIGEST_FOR_OPENSSL +#include +#define HMAC_CTX CCHmacContext +#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len) +#define HMAC_Update CCHmacUpdate +#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash) +#define HMAC_CTX_cleanup +#define EVP_md5() kCCHmacAlgMD5 +#else #include #include +#endif #include #endif -- 1.8.3.rc2.3.g81576a6 ``` ## Junio C Hamano, 2013-05-16 00:36 Subject: Re: [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Message-ID: <7vbo8bahh7.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbo8bahh7.fsf%40alter.siamese.dyndns.org In-Reply-To: <1368663120-47102-1-git-send-email-davvid@gmail.com> ``` David Aguilar 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 > Helped-by: Torsten Bögershausen > Signed-off-by: David Aguilar > --- > 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 = > +else > SHA1_HEADER = > EXTLIBS += $(LIB_4_CRYPTO) > endif > endif > +endif > + > ifdef NO_PERL_MAKEMAKER > export NO_PERL_MAKEMAKER > endif ``` ## Junio C Hamano, 2013-05-16 00:39 Subject: Re: [PATCH v6 2/2] imap-send: eliminate HMAC deprecation warnings on Mac OS X Message-ID: <7v7gizahcn.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v7gizahcn.fsf%40alter.siamese.dyndns.org In-Reply-To: <1368663120-47102-2-git-send-email-davvid@gmail.com> ``` David Aguilar writes: > Mac OS X 10.8 Mountain Lion warns that HMAC_Init() and friends > are deprecated. Detect the COMMON_CRYPTO_FOR_OPENSSL definition Ahh, I think you meant to use that name but forgot to adjust the symbol you use in the patch ;-) I'll queue with s/COMMON_DIGEST_FOR_OPENSSL/COMMON_CRYPTO_FOR_OPENSSL/; > and use CommonCrypto's HMAC functions to eliminate the warnings. > > Signed-off-by: David Aguilar > --- > Changes since last time: None. > > imap-send.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/imap-send.c b/imap-send.c > index d9bcfb4..96012b1 100644 > --- a/imap-send.c > +++ b/imap-send.c > @@ -29,8 +29,18 @@ > #ifdef NO_OPENSSL > typedef void *SSL; > #else > +#ifdef COMMON_DIGEST_FOR_OPENSSL > +#include > +#define HMAC_CTX CCHmacContext > +#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len) > +#define HMAC_Update CCHmacUpdate > +#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash) > +#define HMAC_CTX_cleanup > +#define EVP_md5() kCCHmacAlgMD5 > +#else > #include > #include > +#endif > #include > #endif ``` ## David Aguilar, 2013-05-16 03:28 Subject: Re: [PATCH v6 2/2] imap-send: eliminate HMAC deprecation warnings on Mac OS X Message-ID: URL: https://gitlist.dev/e/CAJDDKr7N8xbUxDDzy%2BBijiJet6C3KV1O-B4tmWRFuZ5odQUuEQ%40mail.gmail.com In-Reply-To: <7v7gizahcn.fsf@alter.siamese.dyndns.org> ``` On Wed, May 15, 2013 at 5:39 PM, Junio C Hamano wrote: > David Aguilar writes: > >> Mac OS X 10.8 Mountain Lion warns that HMAC_Init() and friends >> are deprecated. Detect the COMMON_CRYPTO_FOR_OPENSSL definition > > Ahh, I think you meant to use that name but forgot to adjust the > symbol you use in the patch ;-) > > I'll queue with s/COMMON_DIGEST_FOR_OPENSSL/COMMON_CRYPTO_FOR_OPENSSL/; The symbol in Apple's header is COMMON_DIGEST_FOR_OPENSSL. I rebased this patch for so many bikesheds I was bound to screw up the commit message ;-) >> diff --git a/imap-send.c b/imap-send.c >> index d9bcfb4..96012b1 100644 >> --- a/imap-send.c >> +++ b/imap-send.c >> @@ -29,8 +29,18 @@ >> #ifdef NO_OPENSSL >> typedef void *SSL; >> #else >> +#ifdef COMMON_DIGEST_FOR_OPENSSL Yup, the symbol is fine. >> +#include >> +#define HMAC_CTX CCHmacContext >> +#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len) >> +#define HMAC_Update CCHmacUpdate >> +#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash) >> +#define HMAC_CTX_cleanup >> +#define EVP_md5() kCCHmacAlgMD5 >> +#else >> #include >> #include >> +#endif >> #include >> #endif -- David ``` ## David Aguilar, 2013-05-16 03:31 Subject: Re: [PATCH v6 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Message-ID: URL: https://gitlist.dev/e/CAJDDKr7VavpBhE_w6NKP%2BZxB2YBmwW6mQ-Po763p7v5GmHzoPg%40mail.gmail.com In-Reply-To: <7vbo8bahh7.fsf@alter.siamese.dyndns.org> ``` On Wed, May 15, 2013 at 5:36 PM, Junio C Hamano wrote: > David Aguilar 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? They call it COMMON_DIGEST_FOR_OPENSSL. weirdos, but I guess they mean it's for the digest functions. Thanks for catching the commit message typo. >> >> Helped-by: Eric Sunshine >> Helped-by: Torsten Bögershausen >> Signed-off-by: David Aguilar >> --- >> 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 = >> +else >> SHA1_HEADER = >> EXTLIBS += $(LIB_4_CRYPTO) >> endif >> endif >> +endif >> + >> ifdef NO_PERL_MAKEMAKER >> export NO_PERL_MAKEMAKER >> endif -- David ``` ## Junio C Hamano, 2013-05-16 04:53 Subject: Re: [PATCH v6 2/2] imap-send: eliminate HMAC deprecation warnings on Mac OS X Message-ID: <7vwqqz8r0t.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vwqqz8r0t.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` David Aguilar writes: > On Wed, May 15, 2013 at 5:39 PM, Junio C Hamano wrote: >> David Aguilar writes: >> >>> Mac OS X 10.8 Mountain Lion warns that HMAC_Init() and friends >>> are deprecated. Detect the COMMON_CRYPTO_FOR_OPENSSL definition >> >> Ahh, I think you meant to use that name but forgot to adjust the >> symbol you use in the patch ;-) >> >> I'll queue with s/COMMON_DIGEST_FOR_OPENSSL/COMMON_CRYPTO_FOR_OPENSSL/; > > The symbol in Apple's header is COMMON_DIGEST_FOR_OPENSSL. Sigh. ```