[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7c98706e61feaf10250a7d64c8e6cec936703eb9 (commit)
      from  343a7467c270c54a8e1c85e88e807a1c2e0b6127 (commit)


- Log -----------------------------------------------------------------
commit 7c98706e61feaf10250a7d64c8e6cec936703eb9
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Feb 19 06:59:33 2017 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2680)

-----------------------------------------------------------------------

Summary of changes:
 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 640f314..71855f4 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