[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  63f7291c219ce84298ff98fadfcd70875c3b5318 (commit)
      from  b3c586753b57a3899b40d3e10e2af45d1eb515a2 (commit)


- Log -----------------------------------------------------------------
commit 63f7291c219ce84298ff98fadfcd70875c3b5318
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)
    
    (cherry picked from commit ff25dd1a47525c88500dd61cdeb27faaea6ee599)

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

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 31c90fd..96a74c4 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2012,9 +2012,7 @@ static int sv_body(int s, int stype, 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
 
@@ -2149,9 +2147,9 @@ static int sv_body(int s, int stype, 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))