Ignore the session when setting SNI in s_client
[openssl.git] / test / recipes / 70-test_sslmessages.t
old mode 100755 (executable)
new mode 100644 (file)
index 1c1653a..e3eadfa
@@ -11,18 +11,10 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;
 use File::Temp qw(tempfile);
 use TLSProxy::Proxy;
+use checkhandshake qw(checkhandshake @handmessages @extensions);
 
-my $test_name;
-
-# This block needs to run before 'use lib srctop_dir' directives.
-BEGIN {
-    $test_name = "test_sslmessages";
-    OpenSSL::Test::setup($test_name);
-}
-
-use lib srctop_dir("test", "recipes");
-
-use recipes::checkhandshake qw(checkhandshake @handmessages @extensions);
+my $test_name = "test_sslmessages";
+setup($test_name);
 
 plan skip_all => "TLSProxy isn't usable on $^O"
     if $^O =~ /^(VMS|MSWin32)$/;
@@ -48,101 +40,111 @@ my $proxy = TLSProxy::Proxy->new(
 
 @handmessages = (
     [TLSProxy::Message::MT_CLIENT_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_SERVER_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
+    (disabled("ec") ? () :
+                      [TLSProxy::Message::MT_SERVER_KEY_EXCHANGE,
+                          checkhandshake::EC_HANDSHAKE]),
     [TLSProxy::Message::MT_CERTIFICATE_STATUS,
-        recipes::checkhandshake::OCSP_HANDSHAKE],
+        checkhandshake::OCSP_HANDSHAKE],
     #ServerKeyExchange handshakes not currently supported by TLSProxy
     [TLSProxy::Message::MT_CERTIFICATE_REQUEST,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO_DONE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE_VERIFY,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_NEXT_PROTO,
-        recipes::checkhandshake::NPN_HANDSHAKE],
+        checkhandshake::NPN_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_NEW_SESSION_TICKET,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CLIENT_HELLO,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO_DONE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_NEW_SESSION_TICKET,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [0, 0]
 );
 
 @extensions = (
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION],
+        checkhandshake::SERVER_NAME_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
-    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_GROUPS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
-    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
-    [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
+    (disabled("ec") ? () :
+                      [TLSProxy::Message::MT_CLIENT_HELLO,
+                       TLSProxy::Message::EXT_SUPPORTED_GROUPS,
+                       checkhandshake::DEFAULT_EXTENSIONS]),
+    (disabled("ec") ? () :
+                      [TLSProxy::Message::MT_CLIENT_HELLO,
+                       TLSProxy::Message::EXT_EC_POINT_FORMATS,
+                       checkhandshake::DEFAULT_EXTENSIONS]),
+    (disabled("tls1_2") ? () :
+     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS,
+         checkhandshake::DEFAULT_EXTENSIONS]),
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_CLI_EXTENSION],
+        checkhandshake::ALPN_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SCT,
-        recipes::checkhandshake::SCT_CLI_EXTENSION],
+        checkhandshake::SCT_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,
-        recipes::checkhandshake::RENEGOTIATE_CLI_EXTENSION],
+        checkhandshake::RENEGOTIATE_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_NPN,
-        recipes::checkhandshake::NPN_CLI_EXTENSION],
+        checkhandshake::NPN_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SRP,
-        recipes::checkhandshake::SRP_CLI_EXTENSION],
+        checkhandshake::SRP_CLI_EXTENSION],
 
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,
-        recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION],
+        checkhandshake::SESSION_TICKET_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION],
+        checkhandshake::SERVER_NAME_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
+        checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_SRV_EXTENSION],
+        checkhandshake::ALPN_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SCT,
-        recipes::checkhandshake::SCT_SRV_EXTENSION],
+        checkhandshake::SCT_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_NPN,
-        recipes::checkhandshake::NPN_SRV_EXTENSION],
+        checkhandshake::NPN_SRV_EXTENSION],
+    [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS,
+        checkhandshake::EC_POINT_FORMAT_SRV_EXTENSION],
     [0,0,0]
 );
 
@@ -151,59 +153,64 @@ my $proxy = TLSProxy::Proxy->new(
 $proxy->serverconnects(2);
 $proxy->clientflags("-no_tls1_3 -sess_out ".$session);
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 20;
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+plan tests => 21;
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Default handshake test");
 
 #Test 2: Resumption handshake
 $proxy->clearClient();
 $proxy->clientflags("-no_tls1_3 -sess_in ".$session);
 $proxy->clientstart();
-checkhandshake($proxy, recipes::checkhandshake::RESUME_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               & ~recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               & ~checkhandshake::SESSION_TICKET_SRV_EXTENSION,
                "Resumption handshake test");
 unlink $session;
 
-#Test 3: A status_request handshake (client request only)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -status");
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
-              "status_request handshake test (client)");
-
-#Test 4: A status_request handshake (server support only)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3");
-$proxy->serverflags("-status_file "
-                    .srctop_file("test", "recipes", "ocsp-response.der"));
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
-              "status_request handshake test (server)");
-
-#Test 5: A status_request handshake (client and server)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -status");
-$proxy->serverflags("-status_file "
-                    .srctop_file("test", "recipes", "ocsp-response.der"));
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "status_request handshake test");
+SKIP: {
+    skip "No OCSP support in this OpenSSL build", 3
+        if disabled("ocsp");
+
+    #Test 3: A status_request handshake (client request only)
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3 -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->clientflags("-no_tls1_3");
+    $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)
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3 -status");
+    $proxy->serverflags("-status_file "
+                        .srctop_file("test", "recipes", "ocsp-response.der"));
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::OCSP_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();
 $proxy->clientflags("-no_tls1_3 -cert ".srctop_file("apps", "server.pem"));
 $proxy->serverflags("-Verify 5");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::CLIENT_AUTH_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Client auth handshake test");
 
 #Test 7: A handshake with a renegotiation
@@ -211,150 +218,189 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->reneg(1);
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::RENEG_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
-               "Rengotiation handshake test");
+checkhandshake($proxy, checkhandshake::RENEG_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
+               "Renegotiation handshake test");
 
-#Test 8: Server name handshake (client request only)
+#Test 8: Server name handshake (no client request)
 $proxy->clear();
-$proxy->clientflags("-no_tls1_3 -servername testhost");
+$proxy->clientflags("-no_tls1_3 -noservername");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION,
-              "Server name handshake test (client)");
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               & ~checkhandshake::SERVER_NAME_CLI_EXTENSION,
+               "Server name handshake test (client)");
 
 #Test 9: Server name handshake (server support only)
 $proxy->clear();
-$proxy->clientflags("-no_tls1_3");
+$proxy->clientflags("-no_tls1_3 -noservername");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
-              "Server name handshake test (server)");
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               & ~checkhandshake::SERVER_NAME_CLI_EXTENSION,
+               "Server name handshake test (server)");
 
 #Test 10: Server name handshake (client and server)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -servername testhost");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION
-              | recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION,
-              "Server name handshake test");
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SERVER_NAME_SRV_EXTENSION,
+               "Server name handshake test");
 
 #Test 11: ALPN handshake (client request only)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::ALPN_CLI_EXTENSION,
-              "ALPN handshake test (client)");
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION,
+               "ALPN handshake test (client)");
 
 #Test 12: ALPN handshake (server support only)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
-              "ALPN handshake test (server)");
-              
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
+               "ALPN handshake test (server)");
+
 #Test 13: ALPN handshake (client and server)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -alpn test");
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::ALPN_CLI_EXTENSION
-              | recipes::checkhandshake::ALPN_SRV_EXTENSION,
-              "ALPN handshake test");
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION
+               | checkhandshake::ALPN_SRV_EXTENSION,
+               "ALPN handshake test");
+
+SKIP: {
+    skip "No CT, EC or OCSP support in this OpenSSL build", 1
+        if disabled("ct") || disabled("ec") || disabled("ocsp");
+
+    #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 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, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SCT_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "SCT handshake test (client)");
-
-#Test 15: SCT handshake (server support only)
-$proxy->clear();
-#Note: -ct also sends status_request
-$proxy->clientflags("-no_tls1_3");
-$proxy->serverflags("-status_file "
-                    .srctop_file("test", "recipes", "ocsp-response.der"));
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS,
-              "SCT handshake test (server)");
+SKIP: {
+    skip "No OCSP support in this OpenSSL build", 1
+        if disabled("ocsp");
+
+    #Test 15: SCT handshake (server support only)
+    $proxy->clear();
+    #Note: -ct also sends status_request
+    $proxy->clientflags("-no_tls1_3");
+    $proxy->serverflags("-status_file "
+                        .srctop_file("test", "recipes", "ocsp-response.der"));
+    $proxy->start();
+    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, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SCT_CLI_EXTENSION
-              | recipes::checkhandshake::SCT_SRV_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
-              "SCT handshake test");
+SKIP: {
+    skip "No CT, EC or OCSP support in this OpenSSL build", 1
+        if disabled("ct") || disabled("ec") || disabled("ocsp");
+
+    #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)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -nextprotoneg test");
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::NPN_CLI_EXTENSION,
-              "NPN handshake test (client)");
+SKIP: {
+    skip "No NPN support in this OpenSSL build", 3
+        if disabled("nextprotoneg");
+
+    #Test 17: NPN handshake (client request only)
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3 -nextprotoneg test");
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+                   checkhandshake::DEFAULT_EXTENSIONS
+                   | checkhandshake::NPN_CLI_EXTENSION,
+                   "NPN handshake test (client)");
+
+    #Test 18: NPN handshake (server support only)
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3");
+    $proxy->serverflags("-nextprotoneg test");
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+                   checkhandshake::DEFAULT_EXTENSIONS,
+                   "NPN handshake test (server)");
+
+    #Test 19: NPN handshake (client and server)
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3 -nextprotoneg test");
+    $proxy->serverflags("-nextprotoneg test");
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::NPN_HANDSHAKE,
+                   checkhandshake::DEFAULT_EXTENSIONS
+                   | checkhandshake::NPN_CLI_EXTENSION
+                   | checkhandshake::NPN_SRV_EXTENSION,
+                   "NPN handshake test");
+}
 
-#Test 18: NPN handshake (server support only)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3");
-$proxy->serverflags("-nextprotoneg test");
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
-              "NPN handshake test (server)");
-              
-#Test 19: NPN handshake (client and server)
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -nextprotoneg test");
-$proxy->serverflags("-nextprotoneg test");
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::NPN_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::NPN_CLI_EXTENSION
-              | recipes::checkhandshake::NPN_SRV_EXTENSION,
-              "NPN handshake test");
-
-#Test 20: SRP extension
-#Note: We are not actually going to perform an SRP handshake (TLSProxy does not
-#support it). However it is sufficient for us to check that the SRP extension
-#gets added on the client side. There is no SRP extension generated on the
-#server side anyway.
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -srpuser user -srppass pass:pass");
-$proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SRP_CLI_EXTENSION,
-              "SRP extension test");
+SKIP: {
+    skip "No SRP support in this OpenSSL build", 1
+        if disabled("srp");
+
+    #Test 20: SRP extension
+    #Note: We are not actually going to perform an SRP handshake (TLSProxy
+    #does not support it). However it is sufficient for us to check that the
+    #SRP extension gets added on the client side. There is no SRP extension
+    #generated on the server side anyway.
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3 -srpuser user -srppass pass:pass");
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+                   checkhandshake::DEFAULT_EXTENSIONS
+                   | checkhandshake::SRP_CLI_EXTENSION,
+                   "SRP extension test");
+}
+
+#Test 21: EC handshake
+SKIP: {
+    skip "No EC support in this OpenSSL build", 1 if disabled("ec");
+    $proxy->clear();
+    $proxy->clientflags("-no_tls1_3");
+    $proxy->serverflags("-no_tls1_3");
+    $proxy->ciphers("ECDHE-RSA-AES128-SHA");
+    $proxy->start();
+    checkhandshake($proxy, checkhandshake::EC_HANDSHAKE,
+                   checkhandshake::DEFAULT_EXTENSIONS
+                   | checkhandshake::EC_POINT_FORMAT_SRV_EXTENSION,
+                   "EC handshake test");
+}