[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  de6ac50ddc6c901d43afcd914a1708f9b87efcf2 (commit)
      from  1608d658af4163d2096cb469705d4ba96067877b (commit)


- Log -----------------------------------------------------------------
commit de6ac50ddc6c901d43afcd914a1708f9b87efcf2
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 4 14:47:59 2017 +0100

    Fix an uninit read in igetest
    
    Introduced by commit 0e534337b
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2284)

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

Summary of changes:
 test/igetest.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/igetest.c b/test/igetest.c
index fc80275..f6972b6 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -362,6 +362,7 @@ static int test_bi_ige_garble1(void)
     unsigned int n;
     size_t matches;
 
+    memcpy(iv, saved_iv, sizeof iv);
     AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
@@ -392,6 +393,7 @@ static int test_bi_ige_garble2(void)
     unsigned int n;
     size_t matches;
 
+    memcpy(iv, saved_iv, sizeof iv);
     AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
@@ -422,6 +424,7 @@ static int test_bi_ige_garble3(void)
     unsigned int n;
     size_t matches;
 
+    memcpy(iv, saved_iv, sizeof iv);
     AES_set_encrypt_key(rkey, 8 * sizeof rkey, &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof rkey2, &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,