[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  4bdc25b07f007d9c383fbad159f81543f2e95965 (commit)
      from  161ff6c5fa872ba77be22d2093920cf505534508 (commit)


- Log -----------------------------------------------------------------
commit 4bdc25b07f007d9c383fbad159f81543f2e95965
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)

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

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

diff --git a/apps/ecparam.c b/apps/ecparam.c
index 51877f5..2290242 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);