The branch master has been updated
via 327d38d0ac1da6f6d7ad009260061630f4ec0c82 (commit)
from e0c47b2c3ae2fc593c202e23a0e4689473d91c91 (commit)
- Log -----------------------------------------------------------------
commit 327d38d0ac1da6f6d7ad009260061630f4ec0c82
Author: Richard Levitte <[email protected]>
Date: Wed Jan 4 08:47:05 2017 +0100
Don't test SRP when it's disabled
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2172)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/70-test_sslmessages.t | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/test/recipes/70-test_sslmessages.t
b/test/recipes/70-test_sslmessages.t
index 79c7eb1..1fff99b 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: {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
