From: Matt Caswell <matt@openssl.org>
Date: Thu, 10 Nov 2016 11:27:07 +0000 (+0000)
Subject: Fix the no-tls option
X-Git-Tag: OpenSSL_1_1_1-pre1~3105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f07d639edf849413e24845301fd514ff4a606000;p=oweals%2Fopenssl.git

Fix the no-tls option

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 1e92907d56..d89aa3cf05 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -72,7 +72,7 @@ my %skip = (
   # We should review this once we have TLS 1.3.
   "13-fragmentation.conf" => disabled("tls1_2"),
   "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
-  "15-certstatus.conf" => $no_ocsp,
+  "15-certstatus.conf" => $no_tls || $no_ocsp,
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
   "18-dtls-renegotiate.conf" => $no_dtls,
 );
diff --git a/test/recipes/80-test_sslcorrupt.t b/test/recipes/80-test_sslcorrupt.t
index ca5356d04b..53f8a822e2 100644
--- a/test/recipes/80-test_sslcorrupt.t
+++ b/test/recipes/80-test_sslcorrupt.t
@@ -6,10 +6,14 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
+use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_sslcorrupt");
 
+plan skip_all => "No TLS protocols are supported by this OpenSSL build"
+    if alldisabled(available_protocols("tls"));
+
 plan tests => 1;
 
 ok(run(test(["sslcorrupttest", srctop_file("apps", "server.pem"),