diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-01-26 13:01:30 +0900 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-15 20:01:21 -0500 |
| commit | 3bdc1dc8fcc97a8945ddbc2748e7059207ea3914 (patch) | |
| tree | 395095db31b370cf021ea17fb2d8f47f1716d08e /crypto/evp | |
| parent | b763981b76b6a97c72011c290ec574b37a15f6e4 (diff) | |
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@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2294)
(cherry picked from commit a8f957686675194d786b41f6e1f7c48bb85723ec)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_chacha20_poly1305.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 46bc2cb44f..7fd4f8dfe7 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; } |