[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  42f50fdf8aaff297742f0b541408a89e33e31c6e (commit)
      from  30d1bab146ffef92376f09b7372aac7a75281627 (commit)


- Log -----------------------------------------------------------------
commit 42f50fdf8aaff297742f0b541408a89e33e31c6e
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 3 00:03:47 2017 +0000

    Silence some more clang warnings
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2832)

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

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

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 47d23bd..9fdd61e 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -343,8 +343,8 @@ int tls13_change_cipher_state(SSL *s, int which)
     const unsigned char *label;
     size_t labellen, hashlen = 0;
     int ret = 0;
-    const EVP_MD *md;
-    const EVP_CIPHER *cipher;
+    const EVP_MD *md = NULL;
+    const EVP_CIPHER *cipher = NULL;
 
     if (which & SSL3_CC_READ) {
         if (s->enc_read_ctx != NULL) {