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_0_2o~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d591f300f9dfec4f8345b25714bdc85f0b30dfa1;p=oweals%2Fopenssl.git

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

diff --git a/apps/ecparam.c b/apps/ecparam.c
index a9bf489cdd..deb6705503 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -546,6 +546,9 @@ int MAIN(int argc, char **argv)
         BIO_printf(out, "\treturn(group);\n\t}\n");
     }
 
+    if (outformat == FORMAT_ASN1 && genkey)
+        noout = 1;
+
     if (!noout) {
         if (outformat == FORMAT_ASN1)
             i = i2d_ECPKParameters_bio(out, group);
@@ -582,6 +585,9 @@ int MAIN(int argc, char **argv)
         if (EC_KEY_set_group(eckey, group) == 0)
             goto end;
 
+        if (new_form)
+            EC_KEY_set_conv_form(eckey, form);
+
         if (!EC_KEY_generate_key(eckey)) {
             EC_KEY_free(eckey);
             goto end;