[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_0_2-stable has been updated
       via  d591f300f9dfec4f8345b25714bdc85f0b30dfa1 (commit)
      from  42b291f30be846f50ad5a36dc9d7cbb3ad9c67e1 (commit)


- Log -----------------------------------------------------------------
commit d591f300f9dfec4f8345b25714bdc85f0b30dfa1
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sat Mar 24 15:17:11 2018 +0100

    Fix ecparam -genkey with point compression or DER outform
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5741)
    
    (cherry picked from commit 4bdc25b07f007d9c383fbad159f81543f2e95965)

-----------------------------------------------------------------------

Summary of changes:
 apps/ecparam.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/ecparam.c b/apps/ecparam.c
index a9bf489..deb6705 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;