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 /t/t0013/shattered-1.pdf | |
| parent | fa13fd174f463663ffbc1feef857089fddb4b157 (diff) | |
| parent | e6b07da2780f349c29809bd75d3eca6ad3c35d19 (diff) | |
| download | git-48b3693d3cec7bd7996b1394a8df901d1fc26320.tar.gz git-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 't/t0013/shattered-1.pdf')
| -rw-r--r-- | t/t0013/shattered-1.pdf | bin | 0 -> 422435 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/t/t0013/shattered-1.pdf b/t/t0013/shattered-1.pdf Binary files differnew file mode 100644 index 000000000..ba9aaa145 --- /dev/null +++ b/t/t0013/shattered-1.pdf |