From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sat, 24 Mar 2018 14:17:11 +0000 (+0100)
Subject: Fix ecparam -genkey with point compression or DER outform
X-Git-Tag: OpenSSL_1_1_1-pre4~59
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=4bdc25b07f007d9c383fbad159f81543f2e95965

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

diff --git a/apps/ecparam.c b/apps/ecparam.c
index 51877f5991..2290242310 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -384,6 +384,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);
@@ -410,6 +413,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);