diff options
author | Wolf <wolfwings@gmail.com> | 2021-04-20 14:08:59 -0500 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-04-22 17:43:30 +0200 |
commit | b5644c2a09d6fd1f44321d2e16bea43729d73114 (patch) | |
tree | c18ca906c4890bb949bcb65d26823a8b281723de /apps/ec.c | |
parent | 309c6fbaceb907e5b596a158f0891f42e6694bc2 (diff) |
Force public key to be included unless explicitly excluded with -no_public
Send this before the CLA was accepted, amending to re-trigger check.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14947)
Diffstat (limited to 'apps/ec.c')
-rw-r--r-- | apps/ec.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -211,10 +211,16 @@ int ec_main(int argc, char **argv) goto end; } - if (no_public - && !EVP_PKEY_set_int_param(eckey, OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, 0)) { - BIO_printf(bio_err, "unable to disable public key encoding\n"); - goto end; + if (no_public) { + if (!EVP_PKEY_set_int_param(eckey, OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, 0)) { + BIO_printf(bio_err, "unable to disable public key encoding\n"); + goto end; + } + } else { + if (!EVP_PKEY_set_int_param(eckey, OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, 1)) { + BIO_printf(bio_err, "unable to enable public key encoding\n"); + goto end; + } } if (text) { |