Commit 29a7148d authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6050)

(cherry picked from commit 25642ad2)
parent 7afe18bd

apps/ca.c

+6 −6
Original line number Diff line number Diff line
@@ -725,8 +725,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;

    }
@@ -872,10 +876,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) {