提交 a05bed19 编写于 作者: R Richard Levitte

Fix no-ct, skip tests recipes that try to test CT

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2096)
上级 97043e46
...@@ -265,19 +265,23 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE, ...@@ -265,19 +265,23 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
| checkhandshake::ALPN_SRV_EXTENSION, | checkhandshake::ALPN_SRV_EXTENSION,
"ALPN handshake test"); "ALPN handshake test");
#Test 14: SCT handshake (client request only) SKIP: {
$proxy->clear(); skip "No CT support in this OpenSSL build", 1 if disabled("ct");
#Note: -ct also sends status_request
$proxy->clientflags("-no_tls1_3 -ct"); #Test 14: SCT handshake (client request only)
$proxy->serverflags("-status_file " $proxy->clear();
.srctop_file("test", "recipes", "ocsp-response.der")); #Note: -ct also sends status_request
$proxy->start(); $proxy->clientflags("-no_tls1_3 -ct");
checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, $proxy->serverflags("-status_file "
checkhandshake::DEFAULT_EXTENSIONS .srctop_file("test", "recipes", "ocsp-response.der"));
| checkhandshake::SCT_CLI_EXTENSION $proxy->start();
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION, checkhandshake::DEFAULT_EXTENSIONS
"SCT handshake test (client)"); | checkhandshake::SCT_CLI_EXTENSION
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
"SCT handshake test (client)");
}
#Test 15: SCT handshake (server support only) #Test 15: SCT handshake (server support only)
$proxy->clear(); $proxy->clear();
...@@ -290,23 +294,27 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE, ...@@ -290,23 +294,27 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
checkhandshake::DEFAULT_EXTENSIONS, checkhandshake::DEFAULT_EXTENSIONS,
"SCT handshake test (server)"); "SCT handshake test (server)");
#Test 16: SCT handshake (client and server) SKIP: {
#There is no built-in server side support for this so we are actually also skip "No CT support in this OpenSSL build", 1 if disabled("ct");
#testing custom extensions here
$proxy->clear(); #Test 16: SCT handshake (client and server)
#Note: -ct also sends status_request #There is no built-in server side support for this so we are actually also
$proxy->clientflags("-no_tls1_3 -ct"); #testing custom extensions here
$proxy->serverflags("-status_file " $proxy->clear();
.srctop_file("test", "recipes", "ocsp-response.der") #Note: -ct also sends status_request
." -serverinfo ".srctop_file("test", "serverinfo.pem")); $proxy->clientflags("-no_tls1_3 -ct");
$proxy->start(); $proxy->serverflags("-status_file "
checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, .srctop_file("test", "recipes", "ocsp-response.der")
checkhandshake::DEFAULT_EXTENSIONS ." -serverinfo ".srctop_file("test", "serverinfo.pem"));
| checkhandshake::SCT_CLI_EXTENSION $proxy->start();
| checkhandshake::SCT_SRV_EXTENSION checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION checkhandshake::DEFAULT_EXTENSIONS
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION, | checkhandshake::SCT_CLI_EXTENSION
"SCT handshake test"); | checkhandshake::SCT_SRV_EXTENSION
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
"SCT handshake test");
}
#Test 17: NPN handshake (client request only) #Test 17: NPN handshake (client request only)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册