From 7c98706e61feaf10250a7d64c8e6cec936703eb9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 19 Feb 2017 06:59:33 +0100 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/2680) --- test/recipes/80-test_ssl_new.t | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.25.1