[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a0ef6bb6874ea362ef78e0df1435212383df4774 (commit)
      from  0a699a0723bcc689c07c8110da0fff7f9c2356a4 (commit)


- Log -----------------------------------------------------------------
commit a0ef6bb6874ea362ef78e0df1435212383df4774
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Aug 15 15:58:16 2016 +0200

    Skip the SRP tests in 80-test_ssl_old.t if no TLS versions is enabled
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_old.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 22bb226..9347c96 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -564,7 +564,7 @@ sub testssl {
 
       SKIP: {
 	  skip "skipping SRP tests", 4
-	      if $no_srp;
+	      if $no_srp || alldisabled(grep !/^ssl3/, available_protocols("tls"));
 
 	  ok(run(test([@ssltest, "-tls1", "-cipher", "SRP", "-srpuser", "test", "-srppass", "abc123"])),
 	     'test tls1 with SRP');