From: Richard Levitte <levitte@openssl.org>
Date: Thu, 28 Feb 2019 10:30:19 +0000 (+0100)
Subject: apps/ca.c: only output DER with SPKAC input and when -out is chosen
X-Git-Tag: OpenSSL_1_1_1d~147
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=2ec8ad1bd8b1ae7a61ae8fe46a5633a1b50c0049

apps/ca.c: only output DER with SPKAC input and when -out is chosen

So say the docs

Fixes #8055

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

(cherry picked from commit 69f6b3ceaba493e70e1296880ea6c93e40714f0f)
---

diff --git a/apps/ca.c b/apps/ca.c
index 69207c0662..be7e21a6f2 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -722,7 +722,7 @@ end_of_options:
 
     /*****************************************************************/
     if (req || gencrl) {
-        if (spkac_file != NULL) {
+        if (spkac_file != NULL && outfile != NULL) {
             output_der = 1;
             batch = 1;
         }