diff options
author | Matt Caswell <matt@openssl.org> | 2021-01-15 16:54:28 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2021-02-05 15:22:43 +0000 |
commit | 462f4f4bc0eeb6505a8914bd751b3f20b43ea778 (patch) | |
tree | 02761e4fdcc934bc996588d25f7cb6f0b205e120 /ssl/ssl_rsa.c | |
parent | 54e3efff81f41f71fe17303d5ec6db49415e5d6d (diff) |
Remove OPENSSL_NO_EC guards from libssl
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13916)
Diffstat (limited to 'ssl/ssl_rsa.c')
-rw-r--r-- | ssl/ssl_rsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 7c64a994e8..b78d751818 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -239,12 +239,12 @@ static int ssl_set_cert(CERT *c, X509 *x) ERR_raise(ERR_LIB_SSL, SSL_R_UNKNOWN_CERTIFICATE_TYPE); return 0; } -#ifndef OPENSSL_NO_EC + if (i == SSL_PKEY_ECC && !EVP_PKEY_can_sign(pkey)) { ERR_raise(ERR_LIB_SSL, SSL_R_ECC_CERT_NOT_FOR_SIGNING); return 0; } -#endif + if (c->pkeys[i].privatekey != NULL) { /* * The return code from EVP_PKEY_copy_parameters is deliberately |