mirror of
https://github.com/openssl/openssl.git
synced 2024-11-24 10:34:12 +08:00
Fix test_tls13messages with no-ocsp
s_client -status is not available in this configuration. While here, remove an outdated TODO(TLS1.3) comment. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4873)
This commit is contained in:
parent
cb091295a9
commit
5f21b44068
@ -170,38 +170,39 @@ checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,
|
||||
| checkhandshake::PSK_SRV_EXTENSION),
|
||||
"Resumption handshake test");
|
||||
|
||||
#Test 3: A status_request handshake (client request only)
|
||||
$proxy->clear();
|
||||
$proxy->clientflags("-status");
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS
|
||||
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
|
||||
"status_request handshake test (client)");
|
||||
SKIP: {
|
||||
skip "No OCSP support in this OpenSSL build", 3
|
||||
if disabled("ct") || disabled("ec") || disabled("ocsp");
|
||||
#Test 3: A status_request handshake (client request only)
|
||||
$proxy->clear();
|
||||
$proxy->clientflags("-status");
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS
|
||||
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
|
||||
"status_request handshake test (client)");
|
||||
|
||||
#Test 4: A status_request handshake (server support only)
|
||||
$proxy->clear();
|
||||
$proxy->serverflags("-status_file "
|
||||
.srctop_file("test", "recipes", "ocsp-response.der"));
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS,
|
||||
"status_request handshake test (server)");
|
||||
#Test 4: A status_request handshake (server support only)
|
||||
$proxy->clear();
|
||||
$proxy->serverflags("-status_file "
|
||||
.srctop_file("test", "recipes", "ocsp-response.der"));
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS,
|
||||
"status_request handshake test (server)");
|
||||
|
||||
#Test 5: A status_request handshake (client and server)
|
||||
#TODO(TLS1.3): TLS1.3 doesn't actually have CertificateStatus messages. This is
|
||||
#a temporary test until such time as we do proper TLS1.3 style certificate
|
||||
#status
|
||||
$proxy->clear();
|
||||
$proxy->clientflags("-status");
|
||||
$proxy->serverflags("-status_file "
|
||||
.srctop_file("test", "recipes", "ocsp-response.der"));
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS
|
||||
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
|
||||
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
|
||||
"status_request handshake test");
|
||||
#Test 5: A status_request handshake (client and server)
|
||||
$proxy->clear();
|
||||
$proxy->clientflags("-status");
|
||||
$proxy->serverflags("-status_file "
|
||||
.srctop_file("test", "recipes", "ocsp-response.der"));
|
||||
$proxy->start();
|
||||
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
|
||||
checkhandshake::DEFAULT_EXTENSIONS
|
||||
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
|
||||
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
|
||||
"status_request handshake test");
|
||||
}
|
||||
|
||||
#Test 6: A client auth handshake
|
||||
$proxy->clear();
|
||||
|
Loading…
Reference in New Issue
Block a user