[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  15b1688ac9d1f31ad87d3390dabed42061d90dd8 (commit)
      from  23cec1f4b4801c643853bf2eb07d7eae5f4fe7cb (commit)


- Log -----------------------------------------------------------------
commit 15b1688ac9d1f31ad87d3390dabed42061d90dd8
Author: Paul Yang <paulyang.inf at gmail.com>
Date:   Thu Jun 22 00:31:26 2017 +0800

    Avoid compiler complaining
    
    initialize some local variables
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3741)

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

Summary of changes:
 ssl/statem/extensions_clnt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 846ee30..0d1ca28 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -790,11 +790,11 @@ EXT_RETURN tls_construct_ctos_psk(SSL *s, WPACKET *pkt, unsigned int context,
                                   X509 *x, size_t chainidx, int *al)
 {
 #ifndef OPENSSL_NO_TLS1_3
-    uint32_t now, agesec, agems;
-    size_t reshashsize, pskhashsize, binderoffset, msglen, idlen;
+    uint32_t now, agesec, agems = 0;
+    size_t reshashsize = 0, pskhashsize = 0, binderoffset, msglen, idlen = 0;
     unsigned char *resbinder = NULL, *pskbinder = NULL, *msgstart = NULL;
-    const unsigned char *id;
-    const EVP_MD *handmd = NULL, *mdres, *mdpsk;
+    const unsigned char *id = 0;
+    const EVP_MD *handmd = NULL, *mdres = NULL, *mdpsk = NULL;
     EXT_RETURN ret = EXT_RETURN_FAIL;
     SSL_SESSION *psksess = NULL;
     int dores = 0;