From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Jan 2017 08:34:42 +0000 (+0100)
Subject: Don't run MSBLOB conversion tests when RSA or DSA are disabled
X-Git-Tag: OpenSSL_1_1_1-pre1~2803
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8594555ffaf98ada08b26ce3d1138f16bc029c5;p=oweals%2Fopenssl.git

Don't run MSBLOB conversion tests when RSA or DSA are disabled

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2174)
---

diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index a57ce63a90..5988821703 100644
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -34,6 +34,12 @@ ok(run(app([ 'openssl', 'rsa', '-check', '-in', srctop_file('test', 'testrsa.pem
      subtest 'rsa conversions -- private key PKCS#8' => sub {
 	 tconversion("rsa", srctop_file("test","testrsa.pem"), "pkey");
      };
+}
+
+ SKIP: {
+     skip "Skipping msblob conversion test", 1
+	 if disabled("rsa") || disabled("dsa");
+
      subtest 'rsa conversions -- public key' => sub {
 	 tconversion("msb", srctop_file("test","testrsapub.pem"), "rsa",
 		     "-pubin", "-pubout");