From: Andy Polyakov <appro@openssl.org>
Date: Sat, 15 Sep 2012 08:46:08 +0000 (+0000)
Subject: e_aes.c: uninitialized variable in aes_ccm_init_key [from HEAD].
X-Git-Tag: OpenSSL_1_0_2-beta1~578
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=507e5c3a615e43b1f5a3823506eb7df45d5f0baf;p=oweals%2Fopenssl.git

e_aes.c: uninitialized variable in aes_ccm_init_key [from HEAD].

PR: 2874
Submitted by: Tomas Mraz
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index a0c27ef139..11d728bbc2 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -1221,6 +1221,7 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 			vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks);
 			CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
 					&cctx->ks, (block128_f)vpaes_encrypt);
+			cctx->str = NULL;
 			cctx->key_set = 1;
 			break;
 			}