[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  a7fb4fa1708c65c0932133dca64a53d0237312e3 (commit)
      from  9300f078b6b6a83acd9aabcca89577f1a7800a6f (commit)


- Log -----------------------------------------------------------------
commit a7fb4fa1708c65c0932133dca64a53d0237312e3
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Mar 8 10:51:46 2018 -0500

    Make OCSP "multi" compatible with "no-sock" builds.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 6de0117..82c11e8 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -230,9 +230,7 @@ int ocsp_main(int argc, char **argv)
     int accept_count = -1, add_nonce = 1, noverify = 0, use_ssl = -1;
     int vpmtouched = 0, badsig = 0, i, ignore_err = 0, nmin = 0, ndays = -1;
     int req_text = 0, resp_text = 0, ret = 1;
-# ifndef OPENSSL_NO_SOCK
     int req_timeout = -1;
-# endif
     long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
     unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
     OPTION_CHOICE o;
@@ -483,11 +481,11 @@ int ocsp_main(int argc, char **argv)
                 goto opthelp;
             trailing_md = 1;
             break;
-# ifdef OCSP_DAEMON
         case OPT_MULTI:
+# ifdef OCSP_DAEMON
             multi = atoi(opt_arg());
-            break;
 # endif
+            break;
         }
     }
     if (trailing_md) {