[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  a53d19cd0c4f28ed8c6ef708dcdd0599d1cbea27 (commit)
      from  62d51ffb956332717eac634d159cd8ef2f924cfd (commit)


- Log -----------------------------------------------------------------
commit a53d19cd0c4f28ed8c6ef708dcdd0599d1cbea27
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Mar 25 13:47:48 2018 +0200

    Previously this x509 command line was working, restore that
    
    openssl x509 -in server.pem -signkey privkey.pem -out server.pem
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5747)

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

Summary of changes:
 apps/x509.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/x509.c b/apps/x509.c
index fd39116..9c97d7a 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -450,10 +450,6 @@ int x509_main(int argc, char **argv)
     if (!nmflag_set)
         nmflag = XN_FLAG_ONELINE;
 
-    out = bio_open_default(outfile, 'w', outformat);
-    if (out == NULL)
-        goto end;
-
     if (need_rand)
         app_RAND_load_file(NULL, 0);
 
@@ -579,10 +575,12 @@ int x509_main(int argc, char **argv)
             goto end;
     }
 
-    if (!noout || text || next_serial) {
-        OBJ_create("2.99999.3", "SET.ex3", "SET x509v3 extension 3");
+    out = bio_open_default(outfile, 'w', outformat);
+    if (out == NULL)
+        goto end;
 
-    }
+    if (!noout || text || next_serial)
+        OBJ_create("2.99999.3", "SET.ex3", "SET x509v3 extension 3");
 
     if (alias)
         X509_alias_set1(x, (unsigned char *)alias, -1);