From c429a0dc5652396a69d498cf2006076094688cc8 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Wed, 21 Jan 2026 14:11:35 -0300 Subject: [PATCH] fix one too many checks in chacha20 --- mongoose.c | 3 ++- src/tls_chacha20.c | 3 ++- test/Makefile | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mongoose.c b/mongoose.c index a41c8016..94404a64 100644 --- a/mongoose.c +++ b/mongoose.c @@ -15100,9 +15100,10 @@ static PORTABLE_8439_DECL void poly1305_finish(poly1305_context *ctx, #elif defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || \ defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) || \ defined(__MIPSEL) || defined(__MIPSEL__) || defined(__XTENSA_EL__) || \ - defined(__AVR__) || defined(LITTLE_ENDIAN) + defined(__AVR__) #define __HAVE_LITTLE_ENDIAN 1 #endif +// DO NOT test for LITTLE_ENDIAN, as it is defined as 1234 when including sys/types.h in GCC #ifndef TEST_SLOW_PATH #if defined(__HAVE_LITTLE_ENDIAN) diff --git a/src/tls_chacha20.c b/src/tls_chacha20.c index a15551ff..92d645f3 100644 --- a/src/tls_chacha20.c +++ b/src/tls_chacha20.c @@ -79,9 +79,10 @@ static PORTABLE_8439_DECL void poly1305_finish(poly1305_context *ctx, #elif defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || \ defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) || \ defined(__MIPSEL) || defined(__MIPSEL__) || defined(__XTENSA_EL__) || \ - defined(__AVR__) || defined(LITTLE_ENDIAN) + defined(__AVR__) #define __HAVE_LITTLE_ENDIAN 1 #endif +// DO NOT test for LITTLE_ENDIAN, as it is defined as 1234 when including sys/types.h in GCC #ifndef TEST_SLOW_PATH #if defined(__HAVE_LITTLE_ENDIAN) diff --git a/test/Makefile b/test/Makefile index f42702f5..261f8e23 100644 --- a/test/Makefile +++ b/test/Makefile @@ -179,7 +179,6 @@ armhf: test s390: ASAN= s390: IPV6=0 s390: CFLAGS += -Wno-stringop-overflow -s390: DEFS += -DMG_ENABLE_CHACHA20=0 s390: CC = $(DOCKER) mdashnet/s390 cc s390: RUN = $(DOCKER) --init mdashnet/s390 s390: test