sha1dc: update from upstream
Update sha1dc from the latest version by the upstream maintainer[1]. See commit 6b851e536b ("sha1dc: update from upstream", 2017-06-06) for the last update. This solves the Big Endian detection on Solaris reported against v2.13.2[2], hopefully without any regressions. A version of this has been tested on two Solaris SPARC installations, Cygwin (by jturney on cygwin@Freenode), and on numerous more boring systems (mainly linux/x86_64). See [3] for a discussion of the implementation and platform-specific issues. See commit a0103914c2 ("sha1dc: update from upstream", 2017-05-20) and 6b851e536b ("sha1dc: update from upstream", 2017-06-06) for previous attempts in the 2.13 series to address various compile-time feature detection in this library. 1. https://github.com/cr-marcstevens/sha1collisiondetection/commit/19d97bf5af05312267c2e874ee6bcf584d9e9681 2. <CAKKM46tHq13XiW5C8sux3=PZ1VHSu_npG8ExfWwcPD7rkZkyRQ@mail.gmail.com> (https://public-inbox.org/git/CAKKM46tHq13XiW5C8sux3=PZ1VHSu_npG8ExfWwcPD7rkZkyRQ@mail.gmail.com/) 3. https://github.com/cr-marcstevens/sha1collisiondetection/pull/34 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jul 1, 2017 at 22:05 UTC
9936c1b52a39fa14fca04f937df3e75f7498ac66
1 file changed
+66
-22
sha1dc/sha1.c
+66
-22
@@ -10,6 +10,9 @@
10
#include <memory.h>
11
#include <stdio.h>
12
#include <stdlib.h>
13
+#ifdef __unix__
14
+#include <sys/types.h> /* make sure macros like _BIG_ENDIAN visible */
15
+#endif
16
#endif
17
18
#ifdef SHA1DC_CUSTOM_INCLUDE_SHA1_C
@@ -23,6 +26,13 @@
26
#include "sha1.h"
27
#include "ubc_check.h"
28
29
+#if (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \
30
+ defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || \
31
+ defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(__X86__) || \
32
+ defined(_X86_) || defined(__THW_INTEL__) || defined(__I86__) || defined(__INTEL__) || \
33
+ defined(__386) || defined(_M_X64) || defined(_M_AMD64))
34
+#define SHA1DC_ON_INTEL_LIKE_PROCESSOR
35
+#endif
36
37
/*
38
Because Little-Endian architectures are most common,
@@ -32,29 +42,70 @@
42
If you are compiling on a big endian platform and your compiler does not define one of these,
43
you will have to add whatever macros your tool chain defines to indicate Big-Endianness.
44
*/
35
-#ifdef SHA1DC_BIGENDIAN
36
-#undef SHA1DC_BIGENDIAN
37
-#endif
45
39
-#if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || defined(__BYTE_ORDER__))
40
-
41
-#if ((defined(_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
42
- (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
43
- (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)) )
46
+#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
47
+/*
48
+ * Should detect Big Endian under GCC since at least 4.6.0 (gcc svn
49
+ * rev #165881). See
50
+ * https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
51
+ *
52
+ * This also works under clang since 3.2, it copied the GCC-ism. See
53
+ * clang.git's 3b198a97d2 ("Preprocessor: add __BYTE_ORDER__
54
+ * predefined macro", 2012-07-27)
55
+ */
56
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
57
#define SHA1DC_BIGENDIAN
58
#endif
59
47
-#else
48
-
49
-#if (defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__) || \
50
- defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
51
- defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
52
- defined(__sparc))
60
+/* Not under GCC-alike */
61
+#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN)
62
+/*
63
+ * Should detect Big Endian under glibc.git since 14245eb70e ("entered
64
+ * into RCS", 1992-11-25). Defined in <endian.h> which will have been
65
+ * brought in by standard headers. See glibc.git and
66
+ * https://sourceforge.net/p/predef/wiki/Endianness/
67
+ */
68
+#if __BYTE_ORDER == __BIG_ENDIAN
69
#define SHA1DC_BIGENDIAN
70
#endif
71
72
+/* Not under GCC-alike or glibc */
73
+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
74
+/*
75
+ * *BSD and newlib (embeded linux, cygwin, etc).
76
+ * the defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) part prevents
77
+ * this condition from matching with Solaris/sparc.
78
+ * (Solaris defines only one endian macro)
79
+ */
80
+#if _BYTE_ORDER == _BIG_ENDIAN
81
+#define SHA1DC_BIGENDIAN
82
#endif
83
84
+/* Not under GCC-alike or glibc or *BSD or newlib */
85
+#elif (defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
86
+ defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
87
+ defined(__sparc))
88
+/*
89
+ * Should define Big Endian for a whitelist of known processors. See
90
+ * https://sourceforge.net/p/predef/wiki/Endianness/ and
91
+ * http://www.oracle.com/technetwork/server-storage/solaris/portingtosolaris-138514.html
92
+ */
93
+#define SHA1DC_BIGENDIAN
94
+
95
+/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
96
+#elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
97
+/*
98
+ * As a last resort before we do anything else we're not 100% sure
99
+ * about below, we blacklist specific processors here. We could add
100
+ * more, see e.g. https://wiki.debian.org/ArchitectureSpecificsMemo
101
+ */
102
+#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <processor blacklist> */
103
+
104
+/* We do nothing more here for now */
105
+/*#error "Uncomment this to see if you fall through all the detection"*/
106
+
107
+#endif /* Big Endian detection */
108
+
109
#if (defined(SHA1DC_FORCE_LITTLEENDIAN) && defined(SHA1DC_BIGENDIAN))
110
#undef SHA1DC_BIGENDIAN
111
#endif
@@ -63,15 +114,8 @@
114
#endif
115
/*ENDIANNESS SELECTION*/
116
66
-#if (defined SHA1DC_FORCE_UNALIGNED_ACCESS || \
67
- defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || \
68
- defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || \
69
- defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(__X86__) || \
70
- defined(_X86_) || defined(__THW_INTEL__) || defined(__I86__) || defined(__INTEL__) || \
71
- defined(__386) || defined(_M_X64) || defined(_M_AMD64))
72
-
117
+#if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
118
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
74
-
119
#endif /*UNALIGNMENT DETECTION*/
120
121