configure: remove checking for HMAC_CTX_cleanup

rhenium · gitster · commit 1245c74936d5 · 2016-04-08T11:46:36.000-07:00
We don't need it, as we no longer use HMAC_CTX_cleanup() directly.

Signed-off-by: Kazuki Yamaguchi &lt;k@rhe.jp&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Makefile b/Makefile
@@ -354,9 +354,6 @@ all::
 #
 # Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
 #
-# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
-# cleanup the HMAC context with the older HMAC_cleanup function.
-#
 # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
 # compiles the following initialization:
 #
@@ -1120,9 +1117,6 @@ ifndef NO_OPENSSL
 	ifdef NEEDS_CRYPTO_WITH_SSL
 		OPENSSL_LIBSSL += -lcrypto
 	endif
-	ifdef NO_HMAC_CTX_CLEANUP
-		BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
-	endif
 else
 	BASIC_CFLAGS += -DNO_OPENSSL
 	BLK_SHA1 = 1
diff --git a/configure.ac b/configure.ac
@@ -970,10 +970,6 @@ AC_CHECK_LIB([iconv], [locale_charset],
                      [CHARSET_LIB=-lcharset])])
 GIT_CONF_SUBST([CHARSET_LIB])
 #
-# Define NO_HMAC_CTX_CLEANUP=YesPlease if HMAC_CTX_cleanup is missing.
-AC_CHECK_LIB([crypto], [HMAC_CTX_cleanup],
-	[], [GIT_CONF_SUBST([NO_HMAC_CTX_CLEANUP], [YesPlease])])
-#
 # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
 GIT_CHECK_FUNC(clock_gettime,
 	[HAVE_CLOCK_GETTIME=YesPlease],
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -277,9 +277,6 @@ extern char *gitbasename(char *);
 #endif
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#ifdef NO_HMAC_CTX_CLEANUP
-#define HMAC_CTX_cleanup HMAC_cleanup
-#endif
 #endif
 
 /* On most systems <netdb.h> would have given us this, but

Original file line number	Diff line number	Diff line change
`@@ -354,9 +354,6 @@ all::`
`354`	`354`	`#`
`355`	`355`	`# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.`
`356`	`356`	`#`
`357`		`-# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to`
`358`		`-# cleanup the HMAC context with the older HMAC_cleanup function.`
`359`		`-#`
`360`	`357`	`# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily`
`361`	`358`	`# compiles the following initialization:`
`362`	`359`	`#`
`@@ -1120,9 +1117,6 @@ ifndef NO_OPENSSL`
`1120`	`1117`	`ifdef NEEDS_CRYPTO_WITH_SSL`
`1121`	`1118`	`OPENSSL_LIBSSL += -lcrypto`
`1122`	`1119`	`endif`
`1123`		`- ifdef NO_HMAC_CTX_CLEANUP`
`1124`		`- BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP`
`1125`		`- endif`
`1126`	`1120`	`else`
`1127`	`1121`	`BASIC_CFLAGS += -DNO_OPENSSL`
`1128`	`1122`	`BLK_SHA1 = 1`