diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-27 16:37:22 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-27 16:37:22 +0100 |
| commit | 8175af50cc208c09f92b30358d30dd86c798b60e (patch) | |
| tree | b19206cbabf69c104b9edc66a2c4287db38cbd49 /test/recipes/80-test_ssl_old.t | |
| parent | ec/ecp_nistp*.c: sanitize for undefined/implmentation-specific behaviour. (diff) | |
| download | openssl-8175af50cc208c09f92b30358d30dd86c798b60e.tar.xz openssl-8175af50cc208c09f92b30358d30dd86c798b60e.zip | |
Alternate fix for ../test/recipes/80-test_ssl_old.t with no-ec
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4981)
Diffstat (limited to 'test/recipes/80-test_ssl_old.t')
| -rw-r--r-- | test/recipes/80-test_ssl_old.t | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t index 8b2d02fd0a..2f3d3be6cb 100644 --- a/test/recipes/80-test_ssl_old.t +++ b/test/recipes/80-test_ssl_old.t @@ -398,21 +398,11 @@ sub testssl { my @exkeys = (); my $ciphers = "-EXP:-PSK:-SRP:-kDH:-kECDHe"; - if ($no_dh) { - note "skipping DHE tests\n"; - $ciphers .= ":-kDHE"; - } - if ($no_dsa) { - note "skipping DSA tests\n"; - $ciphers .= ":-aDSA"; - } else { + if (!$no_dsa) { push @exkeys, "-s_cert", "certD.ss", "-s_key", "keyD.ss"; } - if ($no_ec) { - note "skipping EC tests\n"; - $ciphers .= ":!aECDSA:!kECDH"; - } else { + if (!$no_ec) { push @exkeys, "-s_cert", "certE.ss", "-s_key", "keyE.ss"; } |