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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5746)

diff --git a/apps/x509.c b/apps/x509.c
index 1bb9ceffcc4e78c107f4498c6dece03575c9d8e4..11366425522446fd88daa52ccc67153fde5a1d7b 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -467,10 +467,6 @@ int x509_main(int argc, char **argv)
         goto opthelp;
     }
 
         goto opthelp;
     }
 

-    out = bio_open_default(outfile, 'w', outformat);
-    if (out == NULL)
-        goto end;
-

     if (!app_passwd(passinarg, NULL, &passin, NULL)) {
         BIO_printf(bio_err, "Error getting password\n");
         goto end;
     if (!app_passwd(passinarg, NULL, &passin, NULL)) {
         BIO_printf(bio_err, "Error getting password\n");
         goto end;


@@ -596,10 +592,12 @@ int x509_main(int argc, char **argv)
             goto end;
     }
 
             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);
 
     if (alias)
         X509_alias_set1(x, (unsigned char *)alias, -1);