[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  62d51ffb956332717eac634d159cd8ef2f924cfd (commit)
      from  5edeb62306bdba6597f721cd3a41f902dc9a1357 (commit)


- Log -----------------------------------------------------------------
commit 62d51ffb956332717eac634d159cd8ef2f924cfd
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Mar 25 12:50:17 2018 +0200

    Fix dsaparam -genkey with DER outform
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5744)
    
    (cherry picked from commit 5281435258b5d8201a00b4a9781bb724d99630f0)

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

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

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index dd69461..b9d6a42 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -248,6 +248,9 @@ int dsaparam_main(int argc, char **argv)
         OPENSSL_free(data);
     }
 
+    if (outformat == FORMAT_ASN1 && genkey)
+        noout = 1;
+
     if (!noout) {
         if (outformat == FORMAT_ASN1)
             i = i2d_DSAparams_bio(out, dsa);