[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ff25dd1a47525c88500dd61cdeb27faaea6ee599 (commit)
      from  9e5b50b54d1032634979c224f2dd11c84f2900b7 (commit)


- Log -----------------------------------------------------------------
commit ff25dd1a47525c88500dd61cdeb27faaea6ee599
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 26 21:11:26 2018 +0200

    apps/s_server.c: Avoid unused variable due to 'no-dtls'
    
    Fixes #6098
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6104)

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

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

diff --git a/apps/s_server.c b/apps/s_server.c
index be1564a..ef39a4f 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2189,9 +2189,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
     SSL *con = NULL;
     BIO *sbio;
     struct timeval timeout;
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-    struct timeval tv;
-#else
+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS))
     struct timeval *timeoutp;
 #endif
 #ifndef OPENSSL_NO_DTLS
@@ -2392,9 +2390,9 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
              * second and check for any keypress. In a proper Windows
              * application we wouldn't do this because it is inefficient.
              */
-            tv.tv_sec = 1;
-            tv.tv_usec = 0;
-            i = select(width, (void *)&readfds, NULL, NULL, &tv);
+            timeout.tv_sec = 1;
+            timeout.tv_usec = 0;
+            i = select(width, (void *)&readfds, NULL, NULL, &timeout);
             if (has_stdin_waiting())
                 read_from_terminal = 1;
             if ((i < 0) || (!i && !read_from_terminal))