[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0528f253c7eaaaca59870acf07249a726b89f7e5 (commit)
       via  f231b4e7a651713c2a792c71b30aa0398d14b9f1 (commit)
      from  ab29eca645cdb38ffe73d141bbd7c6879b602860 (commit)


- Log -----------------------------------------------------------------
commit 0528f253c7eaaaca59870acf07249a726b89f7e5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Nov 24 09:22:49 2016 +0000

    Fix a bogus uninit var warning
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit f231b4e7a651713c2a792c71b30aa0398d14b9f1
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Nov 24 09:19:04 2016 +0000

    Fix a warning about an uninit var
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/tls13_enc.c        | 2 +-
 test/clienthellotest.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index b5306eb..698b9be 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -290,7 +290,7 @@ int tls13_change_cipher_state(SSL *s, int which)
     unsigned char *finsecret = NULL;
     EVP_CIPHER_CTX *ciph_ctx;
     const EVP_CIPHER *ciph = s->s3->tmp.new_sym_enc;
-    size_t ivlen, keylen, finsecretlen;
+    size_t ivlen, keylen, finsecretlen = 0;
     const unsigned char *label;
     size_t labellen;
     int ret = 0;
diff --git a/test/clienthellotest.c b/test/clienthellotest.c
index 61e81c3..718b582 100644
--- a/test/clienthellotest.c
+++ b/test/clienthellotest.c
@@ -32,7 +32,7 @@
 int main(int argc, char *argv[])
 {
     SSL_CTX *ctx;
-    SSL *con;
+    SSL *con = NULL;
     BIO *rbio;
     BIO *wbio;
     BIO *err;