From: Benjamin Kaduk <kaduk@mit.edu>
Date: Sun, 25 Jun 2017 02:46:36 +0000 (-0500)
Subject: Fix no-dsa build again
X-Git-Tag: OpenSSL_1_1_1-pre1~1204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b996766aa87d5c918e96782f43021e9050a7c079;p=thirdparty%2Fopenssl.git

Fix no-dsa build again

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

diff --git a/test/recipes/60-test_x509_check_cert_pkey.t b/test/recipes/60-test_x509_check_cert_pkey.t
index 51d2996784..d7ee642649 100644
--- a/test/recipes/60-test_x509_check_cert_pkey.t
+++ b/test/recipes/60-test_x509_check_cert_pkey.t
@@ -22,10 +22,13 @@ ok(run(test(["x509_check_cert_pkey_test",
 ok(run(test(["x509_check_cert_pkey_test",
              srctop_file("test", "certs", "servercert.pem"),
              srctop_file("test", "certs", "wrongkey.pem"), "cert", "failed"])));
-# dsa
-ok(run(test(["x509_check_cert_pkey_test",
-             srctop_file("test", "certs", "server-dsa-cert.pem"),
-             srctop_file("test", "certs", "server-dsa-key.pem"), "cert", "ok"])));
+SKIP: {
+    skip "DSA disabled", 1, if disabled("dsa");
+    # dsa
+    ok(run(test(["x509_check_cert_pkey_test",
+		 srctop_file("test", "certs", "server-dsa-cert.pem"),
+		 srctop_file("test", "certs", "server-dsa-key.pem"), "cert", "ok"])));
+}
 # ecc
 SKIP: {
     skip "EC disabled", 1 if disabled("ec");