[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  593a2aa3eb8e0153ff0b6af72b1af3327b46a19e (commit)
      from  e6941c7814bb25729d65e1f8e87d1c110a0cbe7e (commit)


- Log -----------------------------------------------------------------
commit 593a2aa3eb8e0153ff0b6af72b1af3327b46a19e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 6 09:51:54 2017 +0000

    Fix no-psk
    
    Fixes #2847
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2856)

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

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

diff --git a/apps/s_server.c b/apps/s_server.c
index 57bae82..a6048fb 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -144,12 +144,12 @@ static long socket_mtu;
 #endif
 static int dtlslisten = 0;
 
+static int early_data = 0;
+
 #ifndef OPENSSL_NO_PSK
 static char *psk_identity = "Client_identity";
 char *psk_key = NULL;           /* by default PSK is not used */
 
-static int early_data = 0;
-
 static unsigned int psk_server_cb(SSL *ssl, const char *identity,
                                   unsigned char *psk,
                                   unsigned int max_psk_len)