QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-18 20:39:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix openssl ca, to correctly make output file binary when using -spkac

Browse Source 
On Unix, this doesn't matter, but on other platforms, it may.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6050)

(cherry picked from commit 25642ad29e6a2c15c10ceb5e4f029638f73a879e)
This commit is contained in:
Richard Levitte 2018-04-23 10:22:56 +02:00
parent 7afe18bd00
commit 29a7148d4e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/ca.c
View File

@ -725,8 +725,12 @@ end_of_options:
/*****************************************************************/ /*****************************************************************/
if (req || gencrl) { if (req || gencrl) {
/* FIXME: Is it really always text? */ if (spkac_file != NULL) {
Sout = bio_open_default(outfile, 'w', FORMAT_TEXT); output_der = 1;
batch = 1;
}
Sout = bio_open_default(outfile, 'w',
output_der ? FORMAT_ASN1 : FORMAT_TEXT);
if (Sout == NULL) if (Sout == NULL)
goto end; goto end;
} }
@ -872,10 +876,6 @@ end_of_options:
BIO_printf(bio_err, "Memory allocation failure\n"); BIO_printf(bio_err, "Memory allocation failure\n");
goto end; goto end;
} }
if (outfile) {
output_der = 1;
batch = 1;
}
} }
} }
if (ss_cert_file != NULL) { if (ss_cert_file != NULL) {