mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
a0103914c2
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 commit28dc98e343("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.cc465543b32.33a694a9ee3. "Git 2.13.0 segfaults on Solaris SPARC due to DC_SHA1=YesPlease being on by default" (https://public-inbox.org/git/CACBZZX6nmKK8af0-UpjCKWV4R+hV-uk2xWXVA5U+_UQ3VXU03g@mail.gmail.com/) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1.7 KiB
C
52 lines
1.7 KiB
C
/***
|
|
* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
|
|
* Distributed under the MIT Software License.
|
|
* See accompanying file LICENSE.txt or copy at
|
|
* https://opensource.org/licenses/MIT
|
|
***/
|
|
|
|
/*
|
|
// this file was generated by the 'parse_bitrel' program in the tools section
|
|
// using the data files from directory 'tools/data/3565'
|
|
//
|
|
// sha1_dvs contains a list of SHA-1 Disturbance Vectors (DV) to check
|
|
// dvType, dvK and dvB define the DV: I(K,B) or II(K,B) (see the paper)
|
|
// dm[80] is the expanded message block XOR-difference defined by the DV
|
|
// testt is the step to do the recompression from for collision detection
|
|
// maski and maskb define the bit to check for each DV in the dvmask returned by ubc_check
|
|
//
|
|
// ubc_check takes as input an expanded message block and verifies the unavoidable bitconditions for all listed DVs
|
|
// it returns a dvmask where each bit belonging to a DV is set if all unavoidable bitconditions for that DV have been met
|
|
// thus one needs to do the recompression check for each DV that has its bit set
|
|
*/
|
|
|
|
#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[];
|
|
void ubc_check(const uint32_t W[80], uint32_t dvmask[DVMASKSIZE]);
|
|
|
|
#define DOSTORESTATE58
|
|
#define DOSTORESTATE65
|
|
|
|
#define CHECK_DVMASK(_DVMASK) (0 != _DVMASK[0])
|
|
|
|
#if defined(__cplusplus)
|
|
}
|
|
#endif
|
|
|
|
#ifdef SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_H
|
|
#include SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_H
|
|
#endif
|
|
|
|
#endif
|