diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-02-19 06:59:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-19 07:04:20 +0100 |
| commit | 7c98706e61feaf10250a7d64c8e6cec936703eb9 (patch) | |
| tree | 45993038e664ba72ad2a8b17d047932c8baf77f2 /test | |
| parent | 343a7467c270c54a8e1c85e88e807a1c2e0b6127 (diff) | |
Fix no-dh and no-dsa
Since 20-cert-select.conf will vary depending in no-dh and no-dsa,
don't check it against original when those options are selected
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2680)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 640f314fbc..71855f456f 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -46,6 +46,8 @@ my $no_dtls = alldisabled(available_protocols("dtls")); my $no_npn = disabled("nextprotoneg"); my $no_ct = disabled("ct"); my $no_ec = disabled("ec"); +my $no_dh = disabled("dh"); +my $no_dsa = disabled("dsa"); my $no_ec2m = disabled("ec2m"); my $no_ocsp = disabled("ocsp"); @@ -58,7 +60,7 @@ my %conf_dependent_tests = ( "10-resumption.conf" => !$is_default_tls, "11-dtls_resumption.conf" => !$is_default_dtls, "19-mac-then-encrypt.conf" => !$is_default_tls, - "20-cert-select.conf" => !$is_default_tls, + "20-cert-select.conf" => !$is_default_tls && !$no_dh && !$no_dsa, ); # Add your test here if it should be skipped for some compile-time |