]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa13fd1 e6b07da)
Merge branch 'jk/sha1dc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:38 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:38 +0000 (13:07 -0700)
commit48b3693d3cec7bd7996b1394a8df901d1fc26320
treee3565517c9a75e63c6d216f3044f39f679c9bc75tree | snapshot
parentfa13fd174f463663ffbc1feef857089fddb4b157commit | diff
parente6b07da2780f349c29809bd75d3eca6ad3c35d19commit | diff
Merge branch 'jk/sha1dc'

The "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
has been integrated and made the default.

* jk/sha1dc:
  Makefile: make DC_SHA1 the default
  t0013: add a basic sha1 collision detection test
  Makefile: add DC_SHA1 knob
  sha1dc: disable safe_hash feature
  sha1dc: adjust header includes for git
  sha1dc: add collision-detecting sha1 implementation
Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.