[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c324ecfb2d4a6608d7a5f848968180c7995fc9a6 (commit)
      from  6e07834ca0eaeb38da2696e74c16082efd45bbe2 (commit)


- Log -----------------------------------------------------------------
commit c324ecfb2d4a6608d7a5f848968180c7995fc9a6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Apr 18 11:07:18 2018 +0100

    Fix ocsp app exit code
    
    If we run the ocsp command line app and the responder returns a
    non-successful status code then the app should exit with a failure code.
    
    Based on an original patch by Tatsuhiro Tsujikawa.
    
    Fixes #2387
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5998)

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

Summary of changes:
 apps/ocsp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 83461c7..eb822c2 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -697,10 +697,8 @@ redo_accept:
     if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
         BIO_printf(out, "Responder Error: %s (%d)\n",
                    OCSP_response_status_str(i), i);
-        if (!ignore_err) {
-                ret = 0;
+        if (!ignore_err)
                 goto end;
-        }
     }
 
     if (resp_text)