[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e0c47b2c3ae2fc593c202e23a0e4689473d91c91 (commit)
      from  13ab87083af862e4af752efa4b0552149ed2cc19 (commit)


- Log -----------------------------------------------------------------
commit e0c47b2c3ae2fc593c202e23a0e4689473d91c91
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 4 08:28:43 2017 +0100

    Don't run NPN tests when NPN is disabled
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2171)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/70-test_sslmessages.t | 57 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index 9221529..79c7eb1 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