path: root/sha1dc/ubc_check.h
diff options
authorÆvar Arnfjörð Bjarmason <>2017-05-20 11:54:28 (GMT)
committerJunio C Hamano <>2017-05-22 01:20:46 (GMT)
commita0103914c228cee430b37faab212d1769e8218a0 (patch)
tree4529b1cd621837477540389d030bd43df975cee1 /sha1dc/ubc_check.h
parentb06d3643105c8758ed019125a4399cb7efdcce2c (diff)
sha1dc: update from upstream
Update sha1dc from the latest version by the upstream maintainer[1]. This version includes a commit of mine which allows for replacing the local modifications done to the upstream files in git.git with macro definitions to monkeypatch it in place. It also brings in a change[2] upstream made for the breakage 2.13.0 introduced on SPARC and other platforms that forbid unaligned access[3]. This means that the code customizations done since the initial import in commit 28dc98e343 ("sha1dc: add collision-detecting sha1 implementation", 2017-03-16) can be done purely via Makefile definitions and by including the content of our own sha1dc_git.[ch] in sha1dc/sha1.c via a macro. 1. 2. 3. "Git 2.13.0 segfaults on Solaris SPARC due to DC_SHA1=YesPlease being on by default" ( Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'sha1dc/ubc_check.h')
1 files changed, 11 insertions, 3 deletions
diff --git a/sha1dc/ubc_check.h b/sha1dc/ubc_check.h
index b64c306..d7e17dc 100644
--- a/sha1dc/ubc_check.h
+++ b/sha1dc/ubc_check.h
@@ -20,13 +20,17 @@
// thus one needs to do the recompression check for each DV that has its bit set
-#ifndef UBC_CHECK_H
-#define UBC_CHECK_H
#if defined(__cplusplus)
extern "C" {
+#include <stdint.h>
#define DVMASKSIZE 1
typedef struct { int dvType; int dvK; int dvB; int testt; int maski; int maskb; uint32_t dm[80]; } dv_info_t;
extern dv_info_t sha1_dvs[];
@@ -41,4 +45,8 @@ void ubc_check(const uint32_t W[80], uint32_t dvmask[DVMASKSIZE]);
-#endif /* UBC_CHECK_H */