From 18259527835866483430400e4ebbed83a967e463 Mon Sep 17 00:00:00 2001 From: Sameeh Jubran Date: Mon, 9 Mar 2026 14:51:59 +0200 Subject: [PATCH] Fix undefined variable tls1 in InitSuites for PSK cipher suite The WOLFSSL_OLDTLS_SHA2_CIPHERSUITES else-branch for BUILD_TLS_PSK_WITH_AES_128_CBC_SHA256 referenced undeclared variable `tls1` instead of `tls`, a copy-paste typo from commit a975ba9e97 (2019). This caused a compilation error when both WOLFSSL_STATIC_PSK and WOLFSSL_OLDTLS_SHA2_CIPHERSUITES were defined. Add PSK CI config with WOLFSSL_OLDTLS_SHA2_CIPHERSUITES to prevent regressions. Signed-off-by: Sameeh Jubran --- .github/workflows/psk.yml | 1 + src/internal.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/psk.yml b/.github/workflows/psk.yml index 5026c4bdfc..4b1373579a 100644 --- a/.github/workflows/psk.yml +++ b/.github/workflows/psk.yml @@ -18,6 +18,7 @@ jobs: matrix: config: [ # Add new configs here + '--enable-psk C_EXTRA_FLAGS="-DWOLFSSL_STATIC_PSK -DWOLFSSL_OLDTLS_SHA2_CIPHERSUITES"', '--enable-psk C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --disable-rsa --disable-ecc --disable-dh', '--disable-oldtls --disable-tls13 --enable-psk -disable-rsa --disable-dh -disable-ecc --disable-asn C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --enable-lowresource --enable-singlethreaded --disable-asm --disable-errorstrings --disable-pkcs12 --disable-sha3 --disable-sha224 --disable-sha384 --disable-sha512 --disable-sha --disable-md5 -disable-aescbc --disable-chacha --disable-poly1305 --disable-coding --disable-sp-math-all', '--disable-oldtls --disable-tlsv12 --enable-tls13 --enable-psk -disable-rsa --disable-dh -disable-ecc --disable-asn C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --enable-lowresource --enable-singlethreaded --disable-asm --disable-errorstrings --disable-pkcs12 --disable-sha3 --disable-sha224 --disable-sha384 --disable-sha512 --disable-sha --disable-md5 -disable-aescbc --disable-chacha --disable-poly1305 --disable-coding --disable-sp-math-all' diff --git a/src/internal.c b/src/internal.c index 81df695b7a..3f175ac4db 100644 --- a/src/internal.c +++ b/src/internal.c @@ -4250,7 +4250,7 @@ void InitSuites(Suites* suites, ProtocolVersion pv, int keySz, word16 haveRSA, #ifndef WOLFSSL_OLDTLS_SHA2_CIPHERSUITES if (tls1_2 && havePSK && haveAES128) #else - if (tls1 && havePSK && haveAES128) + if (tls && havePSK && haveAES128) #endif { suites->suites[idx++] = CIPHER_BYTE;