summaryrefslogtreecommitdiff
path: root/sha1dc
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-08-02 20:50:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-02 20:54:58 (GMT)
commit23e37f8e9d5961c0c8d52ac481693d3fca5309ce (patch)
treeee1881b3b952c69347ff4ac5b6312de09d3b4a16 /sha1dc
parentffc6fa0e396238de3a30623912980263b4f283ab (diff)
downloadgit-23e37f8e9d5961c0c8d52ac481693d3fca5309ce.zip
git-23e37f8e9d5961c0c8d52ac481693d3fca5309ce.tar.gz
git-23e37f8e9d5961c0c8d52ac481693d3fca5309ce.tar.bz2
sha1dc: update from upstream
Update sha1dc from the latest version by the upstream maintainer[1]. See 2db87328ef ("Merge branch 'ab/sha1dc'", 2017-07-10) for the last update. This fixes an issue where AIX was wrongly detected as a Little-endian instead of a Big-endian system. See [2][3][4]. 1. https://github.com/cr-marcstevens/sha1collisiondetection/commit/232357eb2ea0397388254a4b188333a227bf5b10 2. https://github.com/cr-marcstevens/sha1collisiondetection/pull/45 3. https://github.com/cr-marcstevens/sha1collisiondetection/pull/42 4. https://public-inbox.org/git/20180729200623.GF945730@genre.crustytoothpaste.net/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1dc')
-rw-r--r--sha1dc/sha1.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index 25eded1..df0630b 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -93,13 +93,23 @@
#define SHA1DC_BIGENDIAN
/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
+#elif (defined(_AIX))
+
+/*
+ * Defines Big Endian on a whitelist of OSs that are known to be Big
+ * Endian-only. See
+ * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
+ */
+#define SHA1DC_BIGENDIAN
+
+/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> */
#elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
/*
* As a last resort before we do anything else we're not 100% sure
* about below, we blacklist specific processors here. We could add
* more, see e.g. https://wiki.debian.org/ArchitectureSpecificsMemo
*/
-#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <processor blacklist> */
+#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> or <processor blacklist> */
/* We do nothing more here for now */
/*#error "Uncomment this to see if you fall through all the detection"*/