From: Matt Caswell <matt@openssl.org>
Date: Sun, 10 Dec 2017 10:15:34 +0000 (+0000)
Subject: Fix ssl_test_new with no-tls1_2
X-Git-Tag: OpenSSL_1_1_1-pre1~323
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5fea6657d2e70b72766e640260be45c8f70ac15;p=oweals%2Fopenssl.git

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

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index caf353613a..c5472ebf0f 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) {