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)

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index de8b0bcf2d6eb0be01a7e5fec1d596fad1062696..48a2708d9335371e7b27f47bffaf333f92f3c21b 100755 (executable)
--- 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: {
                "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();
 
     #Test 14: SCT handshake (client request only)
     $proxy->clear();


@@ -304,7 +305,8 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                "SCT handshake test (server)");
 
 SKIP: {
                "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
 
     #Test 16: SCT handshake (client and server)
     #There is no built-in server side support for this so we are actually also