[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1316c9ffabf684302ea2059cdf3765492c3e7da4 (commit)
      from  3ec32be78a5d39cd6d1211e61967590f17918284 (commit)


- Log -----------------------------------------------------------------
commit 1316c9ffabf684302ea2059cdf3765492c3e7da4
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Jun 15 17:01:04 2017 -0400

    Fix no-ec
    
    Also remove nested OPENSSL_NO_EC conditional; it was properly indented,
    but a no-op.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Benjamin Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/3693)

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

Summary of changes:
 ssl/t1_lib.c                                |  2 --
 test/recipes/60-test_x509_check_cert_pkey.t | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index df48f5b..3c5e155 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -621,7 +621,6 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int check_ee_md)
     return rv;
 }
 
-# ifndef OPENSSL_NO_EC
 /*
  * tls1_check_ec_tmp_key - Check EC temporary key compatibility
  * @s: SSL connection
@@ -658,7 +657,6 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid)
         return 1;
     return 0;
 }
-# endif                         /* OPENSSL_NO_EC */
 
 #else
 
diff --git a/test/recipes/60-test_x509_check_cert_pkey.t b/test/recipes/60-test_x509_check_cert_pkey.t
index 794e719..51d2996 100644
--- a/test/recipes/60-test_x509_check_cert_pkey.t
+++ b/test/recipes/60-test_x509_check_cert_pkey.t
@@ -8,6 +8,7 @@
 
 
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_x509_check_cert_pkey");
 
@@ -26,9 +27,12 @@ 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
-ok(run(test(["x509_check_cert_pkey_test",
-             srctop_file("test", "certs", "server-ecdsa-cert.pem"),
-             srctop_file("test", "certs", "server-ecdsa-key.pem"), "cert", "ok"])));
+SKIP: {
+    skip "EC disabled", 1 if disabled("ec");
+    ok(run(test(["x509_check_cert_pkey_test",
+                 srctop_file("test", "certs", "server-ecdsa-cert.pem"),
+                 srctop_file("test", "certs", "server-ecdsa-key.pem"), "cert", "ok"])));
+}
 # certificate request (rsa)
 ok(run(test(["x509_check_cert_pkey_test",
              srctop_file("test", "certs", "x509-check.csr"),