Skip to content

Commit 1245c74

Browse files
rheniumgitster
authored andcommitted
configure: remove checking for HMAC_CTX_cleanup
We don't need it, as we no longer use HMAC_CTX_cleanup() directly. Signed-off-by: Kazuki Yamaguchi <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b51c0d4 commit 1245c74

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,6 @@ all::
354354
#
355355
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
356356
#
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-
#
360357
# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
361358
# compiles the following initialization:
362359
#
@@ -1120,9 +1117,6 @@ ifndef NO_OPENSSL
11201117
ifdef NEEDS_CRYPTO_WITH_SSL
11211118
OPENSSL_LIBSSL += -lcrypto
11221119
endif
1123-
ifdef NO_HMAC_CTX_CLEANUP
1124-
BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
1125-
endif
11261120
else
11271121
BASIC_CFLAGS += -DNO_OPENSSL
11281122
BLK_SHA1 = 1

configure.ac

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -970,10 +970,6 @@ AC_CHECK_LIB([iconv], [locale_charset],
970970
[CHARSET_LIB=-lcharset])])
971971
GIT_CONF_SUBST([CHARSET_LIB])
972972
#
973-
# Define NO_HMAC_CTX_CLEANUP=YesPlease if HMAC_CTX_cleanup is missing.
974-
AC_CHECK_LIB([crypto], [HMAC_CTX_cleanup],
975-
[], [GIT_CONF_SUBST([NO_HMAC_CTX_CLEANUP], [YesPlease])])
976-
#
977973
# Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
978974
GIT_CHECK_FUNC(clock_gettime,
979975
[HAVE_CLOCK_GETTIME=YesPlease],

git-compat-util.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,6 @@ extern char *gitbasename(char *);
277277
#endif
278278
#include <openssl/ssl.h>
279279
#include <openssl/err.h>
280-
#ifdef NO_HMAC_CTX_CLEANUP
281-
#define HMAC_CTX_cleanup HMAC_cleanup
282-
#endif
283280
#endif
284281

285282
/* On most systems <netdb.h> would have given us this, but

0 commit comments

Comments
 (0)