[openssl] OpenSSL_1_1_1-stable update

Richard Levitte levitte at openssl.org
Mon Jun 10 20:00:23 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  2ec8ad1bd8b1ae7a61ae8fe46a5633a1b50c0049 (commit)
      from  81ce7cc8d6d4377c1a3aa22247e9889ef287005f (commit)


- Log -----------------------------------------------------------------
commit 2ec8ad1bd8b1ae7a61ae8fe46a5633a1b50c0049
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)
    
    (cherry picked from commit 69f6b3ceaba493e70e1296880ea6c93e40714f0f)

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

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 69207c0..be7e21a 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;
         }


More information about the openssl-commits mailing list