From b5644c2a09d6fd1f44321d2e16bea43729d73114 Mon Sep 17 00:00:00 2001 From: Wolf Date: Tue, 20 Apr 2021 14:08:59 -0500 Subject: [PATCH] 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 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14947) --- apps/ec.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/ec.c b/apps/ec.c index 3d5371ccdcd..5103838da03 100644 --- a/apps/ec.c +++ b/apps/ec.c @@ -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) { -- 2.47.2