[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  b996766aa87d5c918e96782f43021e9050a7c079 (commit)
      from  05594f4af3ad8c470c34fe97b0f109f167b1e20f (commit)


- Log -----------------------------------------------------------------
commit b996766aa87d5c918e96782f43021e9050a7c079
Author: Benjamin Kaduk <kaduk at mit.edu>
Date:   Sat Jun 24 21:46:36 2017 -0500

    Fix no-dsa build again
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3762)

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

Summary of changes:
 test/recipes/60-test_x509_check_cert_pkey.t | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/recipes/60-test_x509_check_cert_pkey.t b/test/recipes/60-test_x509_check_cert_pkey.t
index 51d2996..d7ee642 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");