summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2021-06-19 16:17:38 +1000
committerPauli <pauli@openssl.org>2021-07-08 21:55:00 +1000
commitd1a8201e88f0a5d46731010bb442f0f207c74fe9 (patch)
treed9f333a88f332d34384698030cc51327d4b9e375 /test
parent987f66d1d7b1ef3576101a56b78f52d3f0e77c07 (diff)
test: add test for auto DH security level meets the minimum
Manual merge from https://github.com/openssl/openssl/pull/15818 Commit id d0e5230dcecc6013d351545ceb275aa2ba5baa80 Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15832)
Diffstat (limited to 'test')
-rw-r--r--test/recipes/80-test_ssl_old.t12
1 files changed, 10 insertions, 2 deletions
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 377bf090ba..35cf0a7af8 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -476,10 +476,10 @@ sub testssl {
subtest 'RSA/(EC)DHE/PSK tests' => sub {
######################################################################
- plan tests => 5;
+ plan tests => 6;
SKIP: {
- skip "TLSv1.0 is not supported by this OpenSSL build", 5
+ skip "TLSv1.0 is not supported by this OpenSSL build", 6
if $no_tls1;
SKIP: {
@@ -514,6 +514,14 @@ sub testssl {
ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123"])),
'test tls1 with PSK via BIO pair');
}
+
+ SKIP: {
+ skip "skipping auto PSK tests", 1
+ if ($no_dh || $no_psk || $no_ec);
+
+ ok(run(test(['ssltest_old', '-psk', '0102030405', '-cipher', '@SECLEVEL=2:DHE-PSK-AES128-CCM'])),
+ 'test auto DH meets security strength');
+ }
}
};