undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: remove checking for HMAC_CTX_cleanup

Browse Source 
We don't need it, as we no longer use HMAC_CTX_cleanup() directly.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kazuki Yamaguchi 2016-04-09 01:22:16 +09:00 committed by Junio C Hamano
parent b51c0d4b4c
commit 1245c74936
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -354,9 +354,6 @@ all::
# #
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt. # 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 # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
# compiles the following initialization: # compiles the following initialization:
# #
@ -1120,9 +1117,6 @@ ifndef NO_OPENSSL
ifdef NEEDS_CRYPTO_WITH_SSL ifdef NEEDS_CRYPTO_WITH_SSL
OPENSSL_LIBSSL += -lcrypto OPENSSL_LIBSSL += -lcrypto
endif endif
ifdef NO_HMAC_CTX_CLEANUP
BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
endif
else else
BASIC_CFLAGS += -DNO_OPENSSL BASIC_CFLAGS += -DNO_OPENSSL
BLK_SHA1 = 1 BLK_SHA1 = 1

4
configure.ac
View File

@ -970,10 +970,6 @@ AC_CHECK_LIB([iconv], [locale_charset],
[CHARSET_LIB=-lcharset])]) [CHARSET_LIB=-lcharset])])
GIT_CONF_SUBST([CHARSET_LIB]) 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. # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
GIT_CHECK_FUNC(clock_gettime, GIT_CHECK_FUNC(clock_gettime,
[HAVE_CLOCK_GETTIME=YesPlease], [HAVE_CLOCK_GETTIME=YesPlease],

3
git-compat-util.h
View File

@ -277,9 +277,6 @@ extern char *gitbasename(char *);
#endif #endif
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
#ifdef NO_HMAC_CTX_CLEANUP
#define HMAC_CTX_cleanup HMAC_cleanup
#endif
#endif #endif
/* On most systems <netdb.h> would have given us this, but /* On most systems <netdb.h> would have given us this, but