From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Jan 2017 07:47:05 +0000 (+0100)
Subject: Don't test SRP when it's disabled
X-Git-Tag: OpenSSL_1_1_1-pre1~2806
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=327d38d0ac1da6f6d7ad009260061630f4ec0c82;p=oweals%2Fopenssl.git

Don't test SRP when it's disabled

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

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index 79c7eb1ea9..1fff99ba53 100755
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -363,18 +363,23 @@ SKIP: {
                    "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, checkhandshake::DEFAULT_HANDSHAKE,
-               checkhandshake::DEFAULT_EXTENSIONS
-               | 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: {