The branch master has been updated via 0c7ec1d2c3a47235ed1e5f9c65769955a41b8b26 (commit) from 86f4e260262aad7524cd6a097592530fc818d3d4 (commit)
- Log ----------------------------------------------------------------- commit 0c7ec1d2c3a47235ed1e5f9c65769955a41b8b26 Author: Pauli <pa...@openssl.org> Date: Mon Jun 21 10:06:50 2021 +1000 test: put the new DHE auto test in the correct place Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/15840) ----------------------------------------------------------------------- Summary of changes: test/recipes/80-test_ssl_old.t | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t index a69f53b606..b144bc9fb9 100644 --- a/test/recipes/80-test_ssl_old.t +++ b/test/recipes/80-test_ssl_old.t @@ -549,7 +549,7 @@ sub testssl { } SKIP: { - skip "skipping PSK tests", 3 + skip "skipping PSK tests", 2 if ($no_psk); ok(run(test([@ssltest, "-tls1", "-cipher", "PSK", "-psk", "abc123"])), @@ -557,10 +557,15 @@ sub testssl { ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123"])), 'test tls1 with PSK via BIO pair'); + } + + SKIP: { + skip "skipping auto DH PSK tests", 1 + if ($no_dh || $no_psk); ok(run(test(['ssl_old_test', '-psk', '0102030405', '-cipher', '@SECLEVEL=2:DHE-PSK-AES128-CCM'])), 'test auto DH meets security strength'); - } + } } };