From: Matt Caswell <matt@openssl.org>
Date: Thu, 2 Mar 2017 23:53:30 +0000 (+0000)
Subject: Silence some clang warnings
X-Git-Tag: OpenSSL_1_1_1-pre1~2127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=30d1bab146ffef92376f09b7372aac7a75281627;p=oweals%2Fopenssl.git

Silence some clang warnings

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2831)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 3190eabab1..57bae82990 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -148,7 +148,7 @@ static int dtlslisten = 0;
 static char *psk_identity = "Client_identity";
 char *psk_key = NULL;           /* by default PSK is not used */
 
-int early_data = 0;
+static int early_data = 0;
 
 static unsigned int psk_server_cb(SSL *ssl, const char *identity,
                                   unsigned char *psk,
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index c613143d88..83fb71313a 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -681,7 +681,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
     SSL_SESSION *sess = NULL;
     unsigned int id, i;
     const EVP_MD *md = NULL;
-    uint32_t ticket_age, now, agesec, agems;
+    uint32_t ticket_age = 0, now, agesec, agems;
 
     /*
      * If we have no PSK kex mode that we recognise then we can't resume so