path: root/
diff options
authorÆvar Arnfjörð Bjarmason <>2017-12-28 14:07:41 (GMT)
committerJunio C Hamano <>2017-12-28 19:55:56 (GMT)
commitedb6a17c36be107e87abd1ff641f317ea578e80e (patch)
tree6c285fbca368a74fb473471d7e15a886d29f1ebe /
parent29533fb16899725af9306e0c3b83da8954c0e48a (diff)
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 <> Reviewed-by: Jonathan Nieder <> Signed-off-by: Ævar Arnfjörð Bjarmason <> Reviewed-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 0 insertions, 1 deletions
diff --git a/ b/
index 2f55237..7f84151 100644
--- a/
+++ b/
@@ -241,7 +241,6 @@ AC_MSG_NOTICE([CHECKS for site configuration])
# a bundled SHA1 routine optimized for PowerPC.
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
-# This also implies BLK_SHA1.
# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
# /foo/bar/include and /foo/bar/lib directories.