summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2018-03-24 15:17:11 +0100
committerBernd Edlinger <bernd.edlinger@hotmail.de>2018-03-25 11:14:07 +0200
commit5edeb62306bdba6597f721cd3a41f902dc9a1357 (patch)
tree94fbfbfb35144a0c1cbde21135f9566925926ea0
parent1bfb7860cb81cf6431308c244a4967e41806a919 (diff)
Fix ecparam -genkey with point compression or DER outform
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5741) (cherry picked from commit 4bdc25b07f007d9c383fbad159f81543f2e95965)
-rw-r--r--apps/ecparam.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 086bbebd3e..775db1bf4e 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -393,6 +393,9 @@ int ecparam_main(int argc, char **argv)
"}\n");
}
+ if (outformat == FORMAT_ASN1 && genkey)
+ noout = 1;
+
if (!noout) {
if (outformat == FORMAT_ASN1)
i = i2d_ECPKParameters_bio(out, group);
@@ -428,6 +431,9 @@ int ecparam_main(int argc, char **argv)
goto end;
}
+ if (new_form)
+ EC_KEY_set_conv_form(eckey, form);
+
if (!EC_KEY_generate_key(eckey)) {
BIO_printf(bio_err, "unable to generate key\n");
EC_KEY_free(eckey);