projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ab46d9 e6b07da)
Merge branch 'jk/sha1dc' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 21:03:28 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 21:03:28 +0000 (14:03 -0700)
commit3455b6c19f22b35de50c0090c57d8536baf1f0b4
tree9c32bd08a1b37ecb74cf7ed34c2fba57dd446910tree | snapshot
parent7ab46d99f4c77335239774e4a52b47478fc3d2c7commit | diff
parente6b07da2780f349c29809bd75d3eca6ad3c35d19commit | diff
Merge branch 'jk/sha1dc' into next

Borrow "detect attempt to create collisions" variant of SHA-1
implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).

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