From 327d38d0ac1da6f6d7ad009260061630f4ec0c82 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 4 Jan 2017 08:47:05 +0100 Subject: [PATCH] Don't test SRP when it's disabled Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2172) --- 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 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: { -- 2.25.1