summaryrefslogtreecommitdiffstats
path: root/test/recipes/80-test_ssl_new.t
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-12-10 10:15:34 +0000
committerMatt Caswell <matt@openssl.org>2017-12-10 11:05:59 +0000
commitf5fea6657d2e70b72766e640260be45c8f70ac15 (patch)
tree3e1dc85914265088bb1a4cda2dd30d3df6acf8ef /test/recipes/80-test_ssl_new.t
parentdf364297495e1d7409f1fcb0f4432c8671019cd8 (diff)
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)
Diffstat (limited to 'test/recipes/80-test_ssl_new.t')
-rw-r--r--test/recipes/80-test_ssl_new.t2
1 files changed, 1 insertions, 1 deletions
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) {