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

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  79037e85140887276476e03ce941b1ff0382543d (commit)
      from  153442640dc616a402363120b530e5d32785f918 (commit)


- Log -----------------------------------------------------------------
commit 79037e85140887276476e03ce941b1ff0382543d
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 17 10:21:25 2017 +0000

    Fix no-dtls builds
    
    Commits f2ff1432f in master and 14d4d7eda in 1.1.0 broke the no-dtls build
    by moving the position of a "#endif" for OPENSSL_NO_DTLS in a change
    which is otherwise unrelated to DTLS. This puts it back to where it was.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2974)
    (cherry picked from commit 9998b32cb63b0bdd3d014abfa1d70e9a2c20a283)

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

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

diff --git a/apps/s_server.c b/apps/s_server.c
index a3ee4d6..7e18aaf 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -137,9 +137,14 @@ static const char *session_id_prefix = NULL;
 #ifndef OPENSSL_NO_DTLS
 static int enable_timeouts = 0;
 static long socket_mtu;
-static int dtlslisten = 0;
 #endif
 
+/*
+ * We define this but make it always be 0 in no-dtls builds to simplify the
+ * code.
+ */
+static int dtlslisten = 0;
+
 #ifndef OPENSSL_NO_PSK
 static const char psk_identity[] = "Client_identity";
 char *psk_key = NULL;           /* by default PSK is not used */