diff options
| author | Kurt Cancemi <kurt@x64architecture.com> | 2016-05-28 07:05:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-20 09:38:37 -0400 |
| commit | b88e95f3a0bbe4656697c6af4023c5848f93081a (patch) | |
| tree | 4b0f312b9c09173603eb2a2d40f6623462ea0034 /crypto/evp/e_aes_cbc_hmac_sha256.c | |
| parent | fb0303f3ce713d1aad72b6711cc96a6cb5120d82 (diff) | |
crypto/evp/e_aes_cbc_hmac_sha256.c: Remove spurious memset
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1231)
Diffstat (limited to 'crypto/evp/e_aes_cbc_hmac_sha256.c')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index b89d873cc1..3b9cdf45d6 100644 --- 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, |