[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  5281435258b5d8201a00b4a9781bb724d99630f0 (commit)
      from  4bdc25b07f007d9c383fbad159f81543f2e95965 (commit)


- Log -----------------------------------------------------------------
commit 5281435258b5d8201a00b4a9781bb724d99630f0
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)

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

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

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 2c1cc61..341480b 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -195,6 +195,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);