From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 12 Sep 2015 02:53:40 +0000 (+0100)
Subject: Skip PSK tests for no-psk
X-Git-Tag: OpenSSL_1_1_0-pre1~442
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71a64af3312d4dfdff2597a979868d2bdd7e3642;p=oweals%2Fopenssl.git

Skip PSK tests for no-psk

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index f84425dfd4..6e5e22e49b 100644
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -468,11 +468,19 @@ sub testssl {
 		 'test tlsv1 with 1024bit RSA, 1024bit DHE, multiple handshakes');
 	    }
 	}
-	ok(run(test([@ssltest, "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
-	   'test tls1 with PSK');
+    {
+        SKIP: {
+	        skip "skipping PSK tests", 2
+	        if ($no_psk);
+
+	        ok(run(test([@ssltest, "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
+	        'test tls1 with PSK');
+
+	        ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
+	        'test tls1 with PSK via BIO pair');
+        }
+    }
 
-	ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
-	   'test tls1 with PSK via BIO pair');
     };
 
     subtest 'Next Protocol Negotiation Tests' => sub {