[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a5e65f7c5ea04f26a6c1745f9a34b63b6956c063 (commit)
      from  a610934c3bdf2c0aafc633d4245efe3df289d716 (commit)


- Log -----------------------------------------------------------------
commit a5e65f7c5ea04f26a6c1745f9a34b63b6956c063
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 24 14:49:32 2017 +0100

    Don't run a CT specifc test if CT is disabled
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4245)

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

Summary of changes:
 test/recipes/70-test_sslextension.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t
index ce25c78..0622e4d 100644
--- a/test/recipes/70-test_sslextension.t
+++ b/test/recipes/70-test_sslextension.t
@@ -160,7 +160,7 @@ sub inject_unsolicited_extension
 }
 
 SKIP: {
-    skip "TLS <= 1.2 disabled", 2 if alldisabled(("tls1", "tls1_1", "tls1_2"));
+    skip "TLS <= 1.2 disabled", 1 if alldisabled(("tls1", "tls1_1", "tls1_2"));
     #Test 4: Inject an unsolicited extension (<= TLSv1.2)
     $proxy->clear();
     $proxy->filter(\&inject_unsolicited_extension);
@@ -168,7 +168,11 @@ SKIP: {
     $proxy->clientflags("-no_tls1_3 -noservername");
     $proxy->start();
     ok(TLSProxy::Message->fail(), "Unsolicited server name extension");
+}
 
+SKIP: {
+    skip "TLS <= 1.2 or CT disabled", 1
+        if alldisabled(("tls1", "tls1_1", "tls1_2")) || disabled("ct");
     #Test 5: Same as above for the SCT extension which has special handling
     $proxy->clear();
     $testtype = UNSOLICITED_SCT;