summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-08-24 14:49:32 +0100
committerMatt Caswell <matt@openssl.org>2017-08-25 10:37:22 +0100
commita5e65f7c5ea04f26a6c1745f9a34b63b6956c063 (patch)
treed4ead3a41686716396ba3452e0e719f380d95eda /test
parenta610934c3bdf2c0aafc633d4245efe3df289d716 (diff)
Don't run a CT specifc test if CT is disabled
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4245)
Diffstat (limited to 'test')
-rw-r--r--test/recipes/70-test_sslextension.t6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t
index ce25c787af..0622e4decc 100644
--- a/test/recipes/70-test_sslextension.t
+++ b/test/recipes/70-test_sslextension.t
@@ -160,7 +160,7 @@ sub inject_unsolicited_extension
}
SKIP: {
- skip "TLS <= 1.2 disabled", 2 if alldisabled(("tls1", "tls1_1", "tls1_2"));
+ skip "TLS <= 1.2 disabled", 1 if alldisabled(("tls1", "tls1_1", "tls1_2"));
#Test 4: Inject an unsolicited extension (<= TLSv1.2)
$proxy->clear();
$proxy->filter(\&inject_unsolicited_extension);
@@ -168,7 +168,11 @@ SKIP: {
$proxy->clientflags("-no_tls1_3 -noservername");
$proxy->start();
ok(TLSProxy::Message->fail(), "Unsolicited server name extension");
+}
+SKIP: {
+ skip "TLS <= 1.2 or CT disabled", 1
+ if alldisabled(("tls1", "tls1_1", "tls1_2")) || disabled("ct");
#Test 5: Same as above for the SCT extension which has special handling
$proxy->clear();
$testtype = UNSOLICITED_SCT;