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)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 640f314fbc95f06a766b2965a49829b057c70f61..71855f456fa47d977f42e40708be67666c79e682 100644 (file)
--- 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_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");
 
 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,
   "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
 );
 
 # Add your test here if it should be skipped for some compile-time