From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Jan 2017 07:28:43 +0000 (+0100)
Subject: Don't run NPN tests when NPN is disabled
X-Git-Tag: OpenSSL_1_1_1-pre1~2807
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0c47b2c3ae2fc593c202e23a0e4689473d91c91;p=oweals%2Fopenssl.git

Don't run NPN tests when NPN is disabled

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2171)
---

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index 9221529827..79c7eb1ea9 100755
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -329,34 +329,39 @@ SKIP: {
 }
 
 
-#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)");
+SKIP: {
+    skip "No NPN support in this OpenSSL build", 3
+        if disabled("nextprotoneg");
 
-#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 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 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, 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 20: SRP extension
 #Note: We are not actually going to perform an SRP handshake (TLSProxy does not