[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  902d036c149c4d723b501bf09b327b2b4e2182af (commit)
       via  5d8ce306349aabcf40da0324242025aac3cc56e4 (commit)
      from  fb83f20c30784aa863a0611fda5f09f488af463a (commit)


- Log -----------------------------------------------------------------
commit 902d036c149c4d723b501bf09b327b2b4e2182af
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Nov 23 16:09:30 2016 +0000

    Fix a double ;; causing a travis failure
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 5d8ce306349aabcf40da0324242025aac3cc56e4
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Nov 23 16:06:46 2016 +0000

    Fix an uninit variable usage
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index f8ccdec..b5306eb 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -289,7 +289,7 @@ int tls13_change_cipher_state(SSL *s, int which)
     unsigned char *insecret;
     unsigned char *finsecret = NULL;
     EVP_CIPHER_CTX *ciph_ctx;
-    const EVP_CIPHER *ciph = s->s3->tmp.new_sym_enc;;
+    const EVP_CIPHER *ciph = s->s3->tmp.new_sym_enc;
     size_t ivlen, keylen, finsecretlen;
     const unsigned char *label;
     size_t labellen;
diff --git a/test/asynciotest.c b/test/asynciotest.c
index d7b1dd3..e147472 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -144,7 +144,7 @@ static int async_write(BIO *bio, const char *in, int inl)
             while (PACKET_remaining(&pkt) > 0) {
                 PACKET payload, wholebody;
                 unsigned int contenttype, versionhi, versionlo, data;
-                unsigned int msgtype = 0, negversion;
+                unsigned int msgtype = 0, negversion = 0;
 
                 if (   !PACKET_get_1(&pkt, &contenttype)
                     || !PACKET_get_1(&pkt, &versionhi)