@matheusbsbs / matheus-bagliano / commits / edb6a17c36

Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1

Use the collision detecting SHA-1 implementation by default even when NO_OPENSSL is set. Setting NO_OPENSSL=UnfortunatelyYes has implied BLK_SHA1=1 ever since the former was introduced in dd53c7ab29 (Support for NO_OPENSSL, 2005-07-29). That implication should have been removed when the default SHA-1 implementation changed from OpenSSL to DC_SHA1 in e6b07da278 (Makefile: make DC_SHA1 the default, 2017-03-17). Finish what that commit started by removing the BLK_SHA1 fallback setting so the default DC_SHA1 implementation will be used. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Dec 28, 2017 at 14:07 UTC edb6a17c36be107e87abd1ff641f317ea578e80e
2 files changed -3
Makefile
-2
@@ -23,7 +23,6 @@ all::
23 # it at all).
24 #
25 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
26 -# This also implies BLK_SHA1.
26 #
27 # Define USE_LIBPCRE if you have and want to use libpcre. Various
28 # commands such as log and grep offer runtime options to use
@@ -1260,7 +1259,6 @@ ifndef NO_OPENSSL
1259 endif
1260 else
1261 BASIC_CFLAGS += -DNO_OPENSSL
1263 - BLK_SHA1 = 1
1262 OPENSSL_LIBSSL =
1263 endif
1264 ifdef NO_OPENSSL
configure.ac
-1
@@ -241,7 +241,6 @@ AC_MSG_NOTICE([CHECKS for site configuration])
241 # a bundled SHA1 routine optimized for PowerPC.
242 #
243 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
244 -# This also implies BLK_SHA1.
244 #
245 # Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
246 # /foo/bar/include and /foo/bar/lib directories.