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)
This commit is contained in:
Matt Caswell 2017-08-24 14:49:32 +01:00
parent a610934c3b
commit a5e65f7c5e

View file

@ -160,7 +160,7 @@ sub inject_unsolicited_extension
} }
SKIP: { 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) #Test 4: Inject an unsolicited extension (<= TLSv1.2)
$proxy->clear(); $proxy->clear();
$proxy->filter(\&inject_unsolicited_extension); $proxy->filter(\&inject_unsolicited_extension);
@ -168,7 +168,11 @@ SKIP: {
$proxy->clientflags("-no_tls1_3 -noservername"); $proxy->clientflags("-no_tls1_3 -noservername");
$proxy->start(); $proxy->start();
ok(TLSProxy::Message->fail(), "Unsolicited server name extension"); 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 #Test 5: Same as above for the SCT extension which has special handling
$proxy->clear(); $proxy->clear();
$testtype = UNSOLICITED_SCT; $testtype = UNSOLICITED_SCT;