mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
Merge branch 'jk/sha1dc'
Build update for SHA-1 with collision detection. * jk/sha1dc: Makefile: fix unaligned loads in sha1dc with UBSan
This commit is contained in:
commit
c063a537be
1
Makefile
1
Makefile
|
@ -1198,6 +1198,7 @@ BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
|
|||
BASIC_CFLAGS += -fno-omit-frame-pointer
|
||||
ifneq ($(filter undefined,$(SANITIZERS)),)
|
||||
BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
|
||||
BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
|
||||
endif
|
||||
ifneq ($(filter leak,$(SANITIZERS)),)
|
||||
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 232357eb2ea0397388254a4b188333a227bf5b10
|
||||
Subproject commit 16033998da4b273aebd92c84b1e1b12e4aaf7009
|
|
@ -124,10 +124,11 @@
|
|||
#endif
|
||||
/*ENDIANNESS SELECTION*/
|
||||
|
||||
#ifndef SHA1DC_FORCE_ALIGNED_ACCESS
|
||||
#if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
|
||||
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
|
||||
#endif /*UNALIGNMENT DETECTION*/
|
||||
|
||||
#endif /*UNALIGNED ACCESS DETECTION*/
|
||||
#endif /*FORCE ALIGNED ACCESS*/
|
||||
|
||||
#define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n))))
|
||||
#define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n))))
|
||||
|
|
Loading…
Reference in a new issue