summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-12-29 10:42:15 +0000
committerMatt Caswell <matt@openssl.org>2016-12-29 13:32:54 +0000
commit0a6793c942b525124990847b50ee18c7dc3359d4 (patch)
tree077f900f4ca499dabc0228ad3d6ffa159ed766c2 /test
parent3cf96e88b78df21bc2ac09a793d1c66ce7912760 (diff)
Fix CT test_sslmessages hangs
The CT tests in test_sslmessages require EC to be available, therefore we must skip these if no-ec Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2153)
Diffstat (limited to 'test')
-rwxr-xr-xtest/recipes/70-test_sslmessages.t6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index de8b0bcf2d..48a2708d93 100755
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -275,7 +275,8 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
"ALPN handshake test");
SKIP: {
- skip "No CT support in this OpenSSL build", 1 if disabled("ct");
+ skip "No CT and/or EC support in this OpenSSL build", 1
+ if disabled("ct") || disabled("ec");
#Test 14: SCT handshake (client request only)
$proxy->clear();
@@ -304,7 +305,8 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
"SCT handshake test (server)");
SKIP: {
- skip "No CT support in this OpenSSL build", 1 if disabled("ct");
+ skip "No CT and/or EC support in this OpenSSL build", 1
+ if disabled("ct") || disabled("ec");
#Test 16: SCT handshake (client and server)
#There is no built-in server side support for this so we are actually also