Skip to content

Commit aa946b2

Browse files
committed
Fix failure in SSLv3 per-version suites test
The test used 3DES as the suite for SSLv3, which now makes the handshake fails with "no ciphersuite in common", failing the test as well. Use Camellia instead (as there are not enough AES ciphersuites before TLS 1.2 to distinguish between the 3 versions). Document some dependencies, but not all. Just trying to avoid introducing new issues by using a new cipher here, not trying to make it perfect, which is a much larger task out of scope of this commit.
1 parent 419bd00 commit aa946b2

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

tests/ssl-opt.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4341,26 +4341,37 @@ run_test "ECJPAKE: working, DTLS, nolog" \
43414341
# Tests for ciphersuites per version
43424342

43434343
requires_config_enabled MBEDTLS_SSL_PROTO_SSL3
4344+
requires_config_enabled MBEDTLS_CAMELLIA_C
4345+
requires_config_enabled MBEDTLS_AES_C
43444346
run_test "Per-version suites: SSL3" \
4345-
"$P_SRV min_version=ssl3 version_suites=TLS-RSA-WITH-3DES-EDE-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
4347+
"$P_SRV min_version=ssl3 version_suites=TLS-RSA-WITH-CAMELLIA-128-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
43464348
"$P_CLI force_version=ssl3" \
43474349
0 \
4348-
-c "Ciphersuite is TLS-RSA-WITH-3DES-EDE-CBC-SHA"
4350+
-c "Ciphersuite is TLS-RSA-WITH-CAMELLIA-128-CBC-SHA"
43494351

4352+
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1
4353+
requires_config_enabled MBEDTLS_CAMELLIA_C
4354+
requires_config_enabled MBEDTLS_AES_C
43504355
run_test "Per-version suites: TLS 1.0" \
4351-
"$P_SRV arc4=1 version_suites=TLS-RSA-WITH-3DES-EDE-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
4356+
"$P_SRV version_suites=TLS-RSA-WITH-CAMELLIA-128-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
43524357
"$P_CLI force_version=tls1 arc4=1" \
43534358
0 \
43544359
-c "Ciphersuite is TLS-RSA-WITH-AES-256-CBC-SHA"
43554360

4361+
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_1
4362+
requires_config_enabled MBEDTLS_CAMELLIA_C
4363+
requires_config_enabled MBEDTLS_AES_C
43564364
run_test "Per-version suites: TLS 1.1" \
4357-
"$P_SRV version_suites=TLS-RSA-WITH-3DES-EDE-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
4365+
"$P_SRV version_suites=TLS-RSA-WITH-CAMELLIA-128-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
43584366
"$P_CLI force_version=tls1_1" \
43594367
0 \
43604368
-c "Ciphersuite is TLS-RSA-WITH-AES-128-CBC-SHA"
43614369

4370+
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
4371+
requires_config_enabled MBEDTLS_CAMELLIA_C
4372+
requires_config_enabled MBEDTLS_AES_C
43624373
run_test "Per-version suites: TLS 1.2" \
4363-
"$P_SRV version_suites=TLS-RSA-WITH-3DES-EDE-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
4374+
"$P_SRV version_suites=TLS-RSA-WITH-CAMELLIA-128-CBC-SHA,TLS-RSA-WITH-AES-256-CBC-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
43644375
"$P_CLI force_version=tls1_2" \
43654376
0 \
43664377
-c "Ciphersuite is TLS-RSA-WITH-AES-128-GCM-SHA256"

0 commit comments

Comments
 (0)