[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e46bcca25e85a361d3ce8431ec5ccc2382ee5569 (commit)
      from  902c6b95a3a3dbf7e5e3dd4b11ec58300ccb8a97 (commit)


- Log -----------------------------------------------------------------
commit e46bcca25e85a361d3ce8431ec5ccc2382ee5569
Author: Adam Eijdenberg <eijdenberg at google.com>
Date:   Wed Jul 29 21:38:22 2015 -0400

    RT3962: Check accept_count only if not unlimited
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/apps/ocsp.c b/apps/ocsp.c
index b6397b8..44f5841 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -666,7 +666,8 @@ int ocsp_main(int argc, char **argv)
 
     /* If running as responder don't verify our own response */
     if (cbio) {
-        if (--accept_count <= 0) {
+        /* If not unlimited, see if we took all we should. */
+        if (accept_count != -1 && --accept_count <= 0) {
             ret = 0;
             goto end;
         }