Merge branch 'jh/mingw-openssl-sha1' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:56:41 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:56:41 +0000 (13:56 -0700)
Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.

* jh/mingw-openssl-sha1:
mingw: use OpenSSL's SHA-1 routines

1  2 
config.mak.uname
diff --combined config.mak.uname
index 447f36ac2e31dd4d11e90f326b114a78fdba8df0,3c295c91d08c0a003bbe81483df7ec2f95656b7f..a07936da8b24f639059d1f024d3cb888068e0faf
@@@ -17,6 -17,9 +17,6 @@@ endi
  # because maintaining the nesting to match is a pain.  If
  # we had "elif" things would have been much nicer...
  
 -ifeq ($(uname_M),x86_64)
 -      XDL_FAST_HASH = YesPlease
 -endif
  ifeq ($(uname_S),OSF1)
        # Need this for u_short definitions et al
        BASIC_CFLAGS += -D_OSF_SOURCE
@@@ -515,7 -518,6 +515,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
        OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
        NO_REGEX = YesPlease
        NO_PYTHON = YesPlease
-       BLK_SHA1 = YesPlease
        ETAGS_TARGET = ETAGS
        NO_INET_PTON = YesPlease
        NO_INET_NTOP = YesPlease