mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 10:00:54 +02:00
Code

Merge branch 'ab/dc-sha1-loose-ends'

Browse Source 
Tying loose ends for the recent integration work of
collision-detecting SHA-1 implementation.

* ab/dc-sha1-loose-ends:
  Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
This commit is contained in:
Junio C Hamano 2018-01-09 14:32:53 -08:00
commit a09a5e6c36
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,6 @@ all::
# it at all).
#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
# This also implies BLK_SHA1.
#
# Define USE_LIBPCRE if you have and want to use libpcre. Various
# commands such as log and grep offer runtime options to use
@ -1275,7 +1274,6 @@ ifndef NO_OPENSSL
endif
else
BASIC_CFLAGS += -DNO_OPENSSL
BLK_SHA1 = 1
OPENSSL_LIBSSL =
endif
ifdef NO_OPENSSL

1
configure.ac
View File

@ -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.