[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  9998b32cb63b0bdd3d014abfa1d70e9a2c20a283 (commit)
      from  3fb2c3e452c9adea24edf8b0b96f6325c0473ee9 (commit)


- Log -----------------------------------------------------------------
commit 9998b32cb63b0bdd3d014abfa1d70e9a2c20a283
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)

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

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 12792e9..5858278 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -138,9 +138,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;
+
 static int early_data = 0;
 
 #ifndef OPENSSL_NO_PSK