git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Adam Dinwoodie" <adam@dinwoodie.org>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Liam R . Howlett" <Liam.Howlett@oracle.com>,
	"Michael Kebe" <michael.kebe@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule
Date: Tue,  6 Jun 2017 15:12:30 +0000	[thread overview]
Message-ID: <20170606151231.25172-3-avarab@gmail.com> (raw)
In-Reply-To: <20170606151231.25172-1-avarab@gmail.com>

Add an option to use the sha1collisiondetection library from the
submodule in sha1collisiondetection/ instead of in the copy in the
sha1dc/ directory.

This allows us to try out the submodule in sha1collisiondetection
without breaking the build for anyone who's not expecting them as we
work out any kinks.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 .gitmodules            |  4 ++++
 Makefile               | 12 ++++++++++++
 hash.h                 |  4 ++++
 sha1collisiondetection |  1 +
 4 files changed, 21 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 sha1collisiondetection

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..cbeebdab7a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "sha1collisiondetection"]
+	path = sha1collisiondetection
+	url = https://github.com/cr-marcstevens/sha1collisiondetection.git
+	branch = master
diff --git a/Makefile b/Makefile
index 7c621f7f76..adeff26d57 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,12 @@ all::
 # algorithm. This is slower, but may detect attempted collision attacks.
 # Takes priority over other *_SHA1 knobs.
 #
+# Define DC_SHA1_SUBMODULE in addition to DC_SHA1 to use the
+# sha1collisiondetection shipped as a submodule instead of the
+# non-submodule copy in sha1dc/. This is an experimental option used
+# by the git project to migrate to using sha1collisiondetection as a
+# submodule.
+#
 # Define OPENSSL_SHA1 environment variable when running make to link
 # with the SHA1 routine from openssl library.
 #
@@ -1416,8 +1422,14 @@ ifdef APPLE_COMMON_CRYPTO
 	BASIC_CFLAGS += -DSHA1_APPLE
 else
 	DC_SHA1 := YesPlease
+ifdef DC_SHA1_SUBMODULE
+	LIB_OBJS += sha1collisiondetection/lib/sha1.o
+	LIB_OBJS += sha1collisiondetection/lib/ubc_check.o
+	BASIC_CFLAGS += -DDC_SHA1_SUBMODULE
+else
 	LIB_OBJS += sha1dc/sha1.o
 	LIB_OBJS += sha1dc/ubc_check.o
+endif
 	BASIC_CFLAGS += \
 		-DSHA1_DC \
 		-DSHA1DC_NO_STANDARD_INCLUDES \
diff --git a/hash.h b/hash.h
index a11fc9233f..bef3e630a0 100644
--- a/hash.h
+++ b/hash.h
@@ -8,7 +8,11 @@
 #elif defined(SHA1_OPENSSL)
 #include <openssl/sha.h>
 #elif defined(SHA1_DC)
+#ifdef DC_SHA1_SUBMODULE
+#include "sha1collisiondetection/lib/sha1.h"
+#else
 #include "sha1dc/sha1.h"
+#endif
 #else /* SHA1_BLK */
 #include "block-sha1/sha1.h"
 #endif
diff --git a/sha1collisiondetection b/sha1collisiondetection
new file mode 160000
index 0000000000..e1399840b5
--- /dev/null
+++ b/sha1collisiondetection
@@ -0,0 +1 @@
+Subproject commit e1399840b501a68ac6c8d7ed9a5cb1455480200e
-- 
2.13.0.506.g27d5fe0cd


  parent reply	other threads:[~2017-06-06 15:13 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-05 20:34 Git v2.13.1 SHA1 very broken Adam Dinwoodie
2017-06-05 21:05 ` Ævar Arnfjörð Bjarmason
2017-06-05 23:20   ` Ramsay Jones
2017-06-06  0:11     ` Ramsay Jones
2017-06-06  1:20   ` Junio C Hamano
2017-06-06 10:03     ` Adam Dinwoodie
2017-06-06 11:55       ` Junio C Hamano
2017-06-06 12:43         ` Adam Dinwoodie
2017-06-06 14:47           ` Continous Integration (was: RE: Git v2.13.1 SHA1 very broken) Jason Pyeron
2017-06-06 15:04             ` Lars Schneider
2017-07-02 20:35               ` Adam Dinwoodie
2017-07-03 12:34                 ` Johannes Schindelin
2017-06-06 15:12           ` [PATCH 0/3] update sha1dc Ævar Arnfjörð Bjarmason
2017-06-06 15:12             ` [PATCH 1/3] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2017-06-06 15:12             ` Ævar Arnfjörð Bjarmason [this message]
2017-06-06 18:48               ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Stefan Beller
2017-06-06 19:03                 ` Ævar Arnfjörð Bjarmason
2017-06-06 19:09                   ` Stefan Beller
2017-06-06 15:12             ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-06 18:23             ` [PATCH 0/3] update sha1dc Stefan Beller
2017-06-06 18:51               ` Ævar Arnfjörð Bjarmason
2017-06-06 19:01                 ` [PATCH] sha1dc: ignore indent-with-non-tab whitespace violations Jeff King
2017-06-06 19:04                   ` Ævar Arnfjörð Bjarmason
2017-06-06 19:05                   ` Stefan Beller
2017-06-13  2:09             ` [PATCH 0/3] update sha1dc Liam R. Howlett
2017-06-06 12:49         ` Git v2.13.1 SHA1 very broken Morten Welinder
  -- strict thread matches above, loose matches on Subject: below --
2017-06-27 12:17 [PATCH 0/3] update sha1dc from PR #36 Ævar Arnfjörð Bjarmason
2017-06-26  7:32 ` Compile Error v2.13.2 on Solaris SPARC Michael Kebe
2017-06-27 12:17   ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 18:46     ` Stefan Beller
2017-06-27 18:56       ` Ævar Arnfjörð Bjarmason

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=20170606151231.25172-3-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=adam@dinwoodie.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=michael.kebe@gmail.com \
    --cc=ramsay@ramsayjones.plus.com \
    /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).