From: Richard Levitte <levitte@openssl.org>
Date: Fri, 31 May 2002 13:11:48 +0000 (+0000)
Subject: For CFB and OFB modes, always create the encryption key.
X-Git-Tag: OpenSSL_0_9_7-beta1~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f918c330a938f667eb6070d5f199ac0ab897fac9;p=oweals%2Fopenssl.git

For CFB and OFB modes, always create the encryption key.
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 9d03a9602f..c323fa2892 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -88,7 +88,9 @@ IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
 static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 		   const unsigned char *iv, int enc) {
 
-	if (enc) 
+	if ((ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_CFB_MODE
+	    || (ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_OFB_MODE
+	    || enc) 
 		AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
 	else
 		AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data);