wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-ec

Browse source 
Also remove nested OPENSSL_NO_EC conditional; it was properly indented,
but a no-op.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3693)
This commit is contained in:
Benjamin Kaduk 2017-06-15 17:01:04 -04:00 committed by Rich Salz
parent 3ec32be78a
commit 1316c9ffab
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/t1_lib.c
View file

@ -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

10
test/recipes/60-test_x509_check_cert_pkey.t
View file

@ -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"),