diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-12-16 10:29:43 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-12-16 14:46:58 +0100 |
| commit | a05bed195277f99c9f8e8149ad49edbc59fc4973 (patch) | |
| tree | ede483a2024138fa27d1e9938cd5408c68e3feca | |
| parent | 97043e46aa7083c787a1efd72ac31ca97ed41610 (diff) | |
| download | openssl-a05bed195277f99c9f8e8149ad49edbc59fc4973.tar.gz | |
Fix no-ct, skip tests recipes that try to test CT
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2096)
| -rwxr-xr-x | test/recipes/70-test_sslmessages.t | 68 |
1 files changed, 38 insertions, 30 deletions
diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t index 4e87e537c3..fb4ec61b49 100755 --- a/test/recipes/70-test_sslmessages.t +++ b/test/recipes/70-test_sslmessages.t @@ -265,19 +265,23 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE, | checkhandshake::ALPN_SRV_EXTENSION, "ALPN handshake test"); -#Test 14: SCT handshake (client request only) -$proxy->clear(); -#Note: -ct also sends status_request -$proxy->clientflags("-no_tls1_3 -ct"); -$proxy->serverflags("-status_file " - .srctop_file("test", "recipes", "ocsp-response.der")); -$proxy->start(); -checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, - checkhandshake::DEFAULT_EXTENSIONS - | checkhandshake::SCT_CLI_EXTENSION - | checkhandshake::STATUS_REQUEST_CLI_EXTENSION - | checkhandshake::STATUS_REQUEST_SRV_EXTENSION, - "SCT handshake test (client)"); +SKIP: { + skip "No CT support in this OpenSSL build", 1 if disabled("ct"); + + #Test 14: SCT handshake (client request only) + $proxy->clear(); + #Note: -ct also sends status_request + $proxy->clientflags("-no_tls1_3 -ct"); + $proxy->serverflags("-status_file " + .srctop_file("test", "recipes", "ocsp-response.der")); + $proxy->start(); + checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, + checkhandshake::DEFAULT_EXTENSIONS + | 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) $proxy->clear(); @@ -290,23 +294,27 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE, checkhandshake::DEFAULT_EXTENSIONS, "SCT handshake test (server)"); -#Test 16: SCT handshake (client and server) -#There is no built-in server side support for this so we are actually also -#testing custom extensions here -$proxy->clear(); -#Note: -ct also sends status_request -$proxy->clientflags("-no_tls1_3 -ct"); -$proxy->serverflags("-status_file " - .srctop_file("test", "recipes", "ocsp-response.der") - ." -serverinfo ".srctop_file("test", "serverinfo.pem")); -$proxy->start(); -checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, - checkhandshake::DEFAULT_EXTENSIONS - | checkhandshake::SCT_CLI_EXTENSION - | checkhandshake::SCT_SRV_EXTENSION - | checkhandshake::STATUS_REQUEST_CLI_EXTENSION - | checkhandshake::STATUS_REQUEST_SRV_EXTENSION, - "SCT handshake test"); +SKIP: { + skip "No CT support in this OpenSSL build", 1 if disabled("ct"); + + #Test 16: SCT handshake (client and server) + #There is no built-in server side support for this so we are actually also + #testing custom extensions here + $proxy->clear(); + #Note: -ct also sends status_request + $proxy->clientflags("-no_tls1_3 -ct"); + $proxy->serverflags("-status_file " + .srctop_file("test", "recipes", "ocsp-response.der") + ." -serverinfo ".srctop_file("test", "serverinfo.pem")); + $proxy->start(); + checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, + checkhandshake::DEFAULT_EXTENSIONS + | checkhandshake::SCT_CLI_EXTENSION + | checkhandshake::SCT_SRV_EXTENSION + | checkhandshake::STATUS_REQUEST_CLI_EXTENSION + | checkhandshake::STATUS_REQUEST_SRV_EXTENSION, + "SCT handshake test"); +} #Test 17: NPN handshake (client request only) |