diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:41 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:41 +0900 |
| commit | 2281b8a36288a13ba17eb908ee7be366843c84f5 (patch) | |
| tree | 1bce094853d22d569f7b5e84ed707f27a8ae3fbd /sha1dc/ubc_check.h | |
| parent | Fifth batch for 2.14 (diff) | |
| parent | sha1dc: update from upstream (diff) | |
| download | tgif-2281b8a36288a13ba17eb908ee7be366843c84f5.tar.xz | |
Merge branch 'ab/sha1dc-maint'
The "collision detecting" SHA-1 implementation shipped with 2.13
was quite broken on some big-endian platforms and/or platforms that
do not like unaligned fetches. Update to the upstream code which
has already fixed these issues.
* ab/sha1dc-maint:
sha1dc: update from upstream
Diffstat (limited to 'sha1dc/ubc_check.h')
| -rw-r--r-- | sha1dc/ubc_check.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sha1dc/ubc_check.h b/sha1dc/ubc_check.h index b64c306d77..d7e17dc734 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 +#ifndef SHA1DC_UBC_CHECK_H +#define SHA1DC_UBC_CHECK_H #if defined(__cplusplus) extern "C" { #endif +#ifndef SHA1DC_NO_STANDARD_INCLUDES +#include <stdint.h> +#endif + #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 -#endif /* UBC_CHECK_H */ +#ifdef SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_H +#include SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_H +#endif + +#endif |