Skip to content

Commit 3bf1ae3

Browse files
authored
Merge pull request #10539 from julek-wolfssl/misc/20260527
Guard test_wrong_cs_downgrade on SHA-384 cipher suite; enable SHA disables in minimal DTLS os-check build
2 parents 3532929 + aff7885 commit 3bf1ae3

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/os-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ jobs:
117117
# variants of mod_exp_<words>_nb / RSA / DH wrappers.
118118
'--enable-curve25519=nonblock --enable-ecc=nonblock --enable-rsa=nonblock --enable-dh=nonblock --enable-sp=yes,nonblock CPPFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DEBUG_NONBLOCK -DRSA_LOW_MEM -DSP_WORD_SIZE=32"',
119119
'--enable-certreq --enable-certext --enable-certgen --disable-secure-renegotiation-info CPPFLAGS="-DNO_TLS"',
120-
# Minimal DTLS 1.3 client-only build. The SHA-224/384/512/3
121-
# disables are deliberately omitted: --disable-sha384 alone
122-
# trips a pre-existing wolfSSL bug in
123-
# test_tls13_duplicate_extension (reproducible on clean master).
120+
# Minimal DTLS 1.3 client-only build with the SHA-224/384/512/3
121+
# hash families disabled. SHA-256 (used by TLS_AES_128_GCM_SHA256)
122+
# and SHA-1 remain enabled.
124123
'--enable-dtls13 --disable-tlsv12 --disable-oldtls --disable-rsa --disable-dh
125124
--disable-aescbc --disable-aesecb --disable-md5 --disable-chacha
126125
--disable-poly1305 --disable-errorstrings --disable-asn-print
127126
--disable-eccshamir --disable-base64encode --disable-coding --disable-sni
127+
--disable-sha224 --disable-sha384 --disable-sha512 --disable-sha3
128128
--enable-aesgcm=small --enable-sp-math --enable-sp=smallec256 --disable-sp-asm
129129
CPPFLAGS=''-DNO_WOLFSSL_SERVER -DWOLFSSL_NO_TLS12 -DNO_SESSION_CACHE
130130
-DWOLFSSL_AES_NO_UNROLL -DUSE_SLOW_SHA256 -DWOLFSSL_NO_ASYNC_IO

tests/api.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30120,7 +30120,8 @@ static int test_extra_alerts_wrong_cs(void)
3012030120
#endif
3012130121

3012230122
#if defined(WOLFSSL_TLS13) && !defined(WOLFSSL_NO_TLS12) && \
30123-
defined(HAVE_MANUAL_MEMIO_TESTS_DEPENDENCIES) && defined(WOLFSSL_AES_256)
30123+
defined(HAVE_MANUAL_MEMIO_TESTS_DEPENDENCIES) && defined(WOLFSSL_AES_256) && \
30124+
defined(BUILD_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)
3012430125

3012530126
#define TEST_CS_DOWNGRADE_CLIENT "ECDHE-RSA-AES256-GCM-SHA384"
3012630127

0 commit comments

Comments
 (0)