[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  69f6b3ceaba493e70e1296880ea6c93e40714f0f (commit)
      from  cee719c2d8e4bfeb1f10d8dc0e86809b3cfaabc5 (commit)


- Log -----------------------------------------------------------------
commit 69f6b3ceaba493e70e1296880ea6c93e40714f0f
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 28 11:30:19 2019 +0100

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

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

Summary of changes:
 apps/ca.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ca.c b/apps/ca.c
index b4ac86d..4464b2b 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;
         }