[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a8f957686675194d786b41f6e1f7c48bb85723ec (commit)
      from  8653e78f4319b23d60239f9557d8c1e1d23be1a5 (commit)


- Log -----------------------------------------------------------------
commit a8f957686675194d786b41f6e1f7c48bb85723ec
Author: Kazuki Yamaguchi <k at rhe.jp>
Date:   Thu Jan 26 13:01:30 2017 +0900

    Properly zero cipher_data for ChaCha20-Poly1305 on cleanup
    
    Fix a typo. Probably this has not been found because EVP_CIPHER_CTX is
    smaller than EVP_CHACHA_AEAD_CTX and heap overflow does not occur.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2294)

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

Summary of changes:
 crypto/evp/e_chacha20_poly1305.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 46bc2cb..7fd4f8d 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -316,7 +316,7 @@ static int chacha20_poly1305_cleanup(EVP_CIPHER_CTX *ctx)
 {
     EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
     if (actx)
-        OPENSSL_cleanse(ctx->cipher_data, sizeof(*ctx) + Poly1305_ctx_size());
+        OPENSSL_cleanse(ctx->cipher_data, sizeof(*actx) + Poly1305_ctx_size());
     return 1;
 }