[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e46931108a1c4ae35903e4b6b481b341545f3ea3 (commit)
      from  9fcfd0cd860610d69268414b9671b5ed3274bfcd (commit)


- Log -----------------------------------------------------------------
commit e46931108a1c4ae35903e4b6b481b341545f3ea3
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 20 11:16:39 2018 +0000

    Fix the OCSP responder mode
    
    Broken by commit 3e3c7c36.
    
    Fixes #5681
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/5688)

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

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

diff --git a/apps/ocsp.c b/apps/ocsp.c
index ed2281a..7581531 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -551,7 +551,7 @@ int ocsp_main(int argc, char **argv)
     }
 
     if (ridx_filename != NULL
-        && (rkey != NULL || rsigner != NULL || rca_cert != NULL)) {
+        && (rkey == NULL || rsigner == NULL || rca_cert == NULL)) {
         BIO_printf(bio_err,
                    "Responder mode requires certificate, key, and CA.\n");
         goto end;