projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb0303f
)
crypto/evp/e_aes_cbc_hmac_sha256.c: Remove spurious memset
author
Kurt Cancemi
<kurt@x64architecture.com>
Sat, 28 May 2016 11:05:15 +0000
(07:05 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Mon, 20 Jun 2016 13:38:37 +0000
(09:38 -0400)
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1231)
crypto/evp/e_aes_cbc_hmac_sha256.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_aes_cbc_hmac_sha256.c
b/crypto/evp/e_aes_cbc_hmac_sha256.c
index b89d873cc19d035b310218e1245e05bb3f8d91b1..3b9cdf45d636607f14a3e168aef1a28ced881baa 100644
(file)
--- a/
crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/
crypto/evp/e_aes_cbc_hmac_sha256.c
@@
-81,10
+81,9
@@
static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
int ret;
if (enc)
- memset(&key->ks, 0, sizeof(key->ks.rd_key)),
- ret = aesni_set_encrypt_key(inkey,
- EVP_CIPHER_CTX_key_length(ctx) * 8,
- &key->ks);
+ ret = aesni_set_encrypt_key(inkey,
+ EVP_CIPHER_CTX_key_length(ctx) * 8,
+ &key->ks);
else
ret = aesni_set_decrypt_key(inkey,
EVP_CIPHER_CTX_key_length(ctx) * 8,