[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  25642ad29e6a2c15c10ceb5e4f029638f73a879e (commit)
      from  10b37541dc7f27b0ca74102970691ce4636cc0bd (commit)


- Log -----------------------------------------------------------------
commit 25642ad29e6a2c15c10ceb5e4f029638f73a879e
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 23 10:22:56 2018 +0200

    Fix openssl ca, to correctly make output file binary when using -spkac
    
    On Unix, this doesn't matter, but on other platforms, it may.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6050)

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

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

diff --git a/apps/ca.c b/apps/ca.c
index 1c053b5..ea774ad 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -722,8 +722,12 @@ end_of_options:
 
     /*****************************************************************/
     if (req || gencrl) {
-        /* FIXME: Is it really always text? */
-        Sout = bio_open_default(outfile, 'w', FORMAT_TEXT);
+        if (spkac_file != NULL) {
+            output_der = 1;
+            batch = 1;
+        }
+        Sout = bio_open_default(outfile, 'w',
+                                output_der ? FORMAT_ASN1 : FORMAT_TEXT);
         if (Sout == NULL)
             goto end;
     }
@@ -877,10 +881,6 @@ end_of_options:
                     BIO_printf(bio_err, "Memory allocation failure\n");
                     goto end;
                 }
-                if (outfile) {
-                    output_der = 1;
-                    batch = 1;
-                }
             }
         }
         if (ss_cert_file != NULL) {