From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [RFC PATCH 0/3] Git integration update for DC-SHA1
Date: Fri, 17 Mar 2017 10:09:35 -0700 [thread overview]
Message-ID: <20170317170938.20593-1-gitster@pobox.com> (raw)
In-Reply-To: <20170317111814.tkzeqfyr3aiyxsxr@sigill.intra.peff.net>
Here are three patches to replace the last two patches from your
series.
- The Makefile knob is named DC_SHA1, not USE_SHA1DC; this is to
keep it consistent with existing BLK_SHA1 and PPC_SHA1.
- The CPP macro is called SHA1_DC, not SHA1_SHA1DC; again this is
for consistency with SHA1_BLK and SHA1_PPC.
- Switch the default from OpenSSL's implementation to DC_SHA1.
Those who want OpenSSL's one can ask with OPENSSL_SHA1.
Jeff King (2):
Makefile: add DC_SHA1 knob
t0013: add a basic sha1 collision detection test
Junio C Hamano (1):
Makefile: make DC_SHA1 the default
Makefile | 19 +++++++++++++++++--
hash.h | 2 ++
sha1dc/sha1.c | 20 ++++++++++++++++++++
sha1dc/sha1.h | 15 +++++++++++++++
t/t0013-sha1dc.sh | 19 +++++++++++++++++++
t/t0013/shattered-1.pdf | Bin 0 -> 422435 bytes
6 files changed, 73 insertions(+), 2 deletions(-)
create mode 100755 t/t0013-sha1dc.sh
create mode 100644 t/t0013/shattered-1.pdf
--
2.12.0-317-g32c43f595f
next prev parent reply other threads:[~2017-03-17 17:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 20:24 [PATCH 0/2] Re-integrate sha1dc Linus Torvalds
2017-03-16 22:04 ` Jeff King
2017-03-16 22:08 ` [PATCH 2/5] sha1dc: adjust header includes for git Jeff King
2017-03-16 22:08 ` [PATCH 3/5] sha1dc: disable safe_hash feature Jeff King
2017-03-16 22:09 ` [PATCH 4/5] Makefile: add USE_SHA1DC knob Jeff King
2017-03-16 22:43 ` Junio C Hamano
2017-03-17 0:11 ` Jeff King
2017-03-17 5:24 ` Junio C Hamano
2017-03-17 11:18 ` Jeff King
2017-03-17 17:09 ` Junio C Hamano [this message]
2017-03-17 17:09 ` [PATCH 1/3] Makefile: add DC_SHA1 knob Junio C Hamano
2017-03-17 17:09 ` [PATCH 3/3] Makefile: make DC_SHA1 the default Junio C Hamano
2017-03-17 17:41 ` [RFC PATCH 0/3] Git integration update for DC-SHA1 Junio C Hamano
2017-03-17 17:45 ` Jeff King
2017-03-16 22:10 ` [PATCH 0/2] Re-integrate sha1dc Jeff King
2017-03-16 22:23 ` Junio C Hamano
2017-03-17 0:14 ` Jeff King
2017-03-17 5:22 ` Junio C Hamano
2017-03-17 11:22 ` Jeff King
2017-03-16 22:30 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170317170938.20593-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).