[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f5fea6657d2e70b72766e640260be45c8f70ac15 (commit)
      from  df364297495e1d7409f1fcb0f4432c8671019cd8 (commit)


- Log -----------------------------------------------------------------
commit f5fea6657d2e70b72766e640260be45c8f70ac15
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Dec 10 10:15:34 2017 +0000

    Fix ssl_test_new with no-tls1_2
    
    The tests in 25-cipher.conf all use TLSv1.2 ciphersuites so we shouldn't
    run it if we don't have TLSv1.2
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4889)

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

Summary of changes:
 test/recipes/80-test_ssl_new.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index caf3536..c5472eb 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -94,7 +94,7 @@ my %skip = (
   "23-srp.conf" => (disabled("tls1") && disabled ("tls1_1")
                     && disabled("tls1_2")) || disabled("srp"),
   "24-padding.conf" => disabled("tls1_3"),
-  "25-cipher.conf" => disabled("ec"),
+  "25-cipher.conf" => disabled("ec") || disabled("tls1_2"),
 );
 
 foreach my $conf (@conf_files) {