From: Benjamin Kaduk Date: Thu, 15 Jun 2017 21:01:04 +0000 (-0400) Subject: Fix no-ec X-Git-Tag: OpenSSL_1_1_1-pre1~1306 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=1316c9ffabf684302ea2059cdf3765492c3e7da4 Fix no-ec Also remove nested OPENSSL_NO_EC conditional; it was properly indented, but a no-op. Reviewed-by: Rich Salz Reviewed-by: Benjamin Kaduk (Merged from https://github.com/openssl/openssl/pull/3693) --- diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index df48f5b34d..3c5e155066 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 794e71959f..51d2996784 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"),