summaryrefslogtreecommitdiffstats
path: root/test/recipes
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2016-08-10 18:36:47 +0200
committerEmilia Kasper <emilia@openssl.org>2016-08-10 18:46:06 +0200
commitbe82f7b32087496d94edaa309a7b2ea9a8c84e1d (patch)
tree4f49ac8b8d75a79fe173ce89d37f898bab82bdda /test/recipes
parente86e76a6c4744244104838700eebeb54209b5827 (diff)
Don't attempt to load the CT log list with no-ec
In practice, CT isn't really functional without EC anyway, as most logs use EC keys. So, skip loading the log list with no-ec, and skip CT tests completely in that conf. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/recipes')
-rw-r--r--test/recipes/80-test_ssl_new.t3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 1530bc2f3d..06ddbdcca4 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -42,6 +42,7 @@ my $no_tls = alldisabled(available_protocols("tls"));
my $no_dtls = alldisabled(available_protocols("dtls"));
my $no_npn = disabled("nextprotoneg");
my $no_ct = disabled("ct");
+my $no_ec = disabled("ec");
my %conf_dependent_tests = (
"02-protocol-version.conf" => !$is_default_tls,
@@ -57,7 +58,7 @@ my %skip = (
"08-npn.conf" => $no_tls || $no_npn,
"10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
"11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
- "12-ct.conf" => $no_tls || $no_ct,
+ "12-ct.conf" => $no_tls || $no_ct || $no_ec,
);
foreach my $conf (@conf_files) {