Skip to content

Commit 1825952

Browse files
committed
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 a975ba9 (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 <sameeh@wolfssl.com>
1 parent b3f08f3 commit 1825952

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/psk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
matrix:
1919
config: [
2020
# Add new configs here
21+
'--enable-psk C_EXTRA_FLAGS="-DWOLFSSL_STATIC_PSK -DWOLFSSL_OLDTLS_SHA2_CIPHERSUITES"',
2122
'--enable-psk C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --disable-rsa --disable-ecc --disable-dh',
2223
'--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',
2324
'--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'

src/internal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4250,7 +4250,7 @@ void InitSuites(Suites* suites, ProtocolVersion pv, int keySz, word16 haveRSA,
42504250
#ifndef WOLFSSL_OLDTLS_SHA2_CIPHERSUITES
42514251
if (tls1_2 && havePSK && haveAES128)
42524252
#else
4253-
if (tls1 && havePSK && haveAES128)
4253+
if (tls && havePSK && haveAES128)
42544254
#endif
42554255
{
42564256
suites->suites[idx++] = CIPHER_BYTE;

0 commit comments

Comments
 (0)