diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:07:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:07:38 -0700 |
| commit | 48b3693d3cec7bd7996b1394a8df901d1fc26320 (patch) | |
| tree | e3565517c9a75e63c6d216f3044f39f679c9bc75 /grep.c | |
| parent | Merge branch 'sg/test-with-stdin' (diff) | |
| parent | Makefile: make DC_SHA1 the default (diff) | |
| download | tgif-48b3693d3cec7bd7996b1394a8df901d1fc26320.tar.xz | |
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
Diffstat (limited to 'grep.c')
0 files changed, 0 insertions, 0 deletions