generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e_aes.c: fix aes_cfb1_cipher.

Browse Source
This commit is contained in:
Andy Polyakov 2011-05-30 10:10:05 +00:00
parent d1fff483d6
commit e76cbcf686
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/evp/e_aes.c
View File

@ -196,14 +196,30 @@ static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
return 1; return 1;
} }
#define MAXBITCHUNK ((size_t)1<<(sizeof(size_t)*8-4))
static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
const unsigned char *in,size_t len) const unsigned char *in,size_t len)
{ {
CRYPTO_cfb128_1_encrypt(in,out,len,ctx->cipher_data, block128_f block = OPENSSL_ia32cap_P[1]&AESNI_CAPABLE ?
ctx->iv,&ctx->num,ctx->encrypt,
OPENSSL_ia32cap_P[1]&AESNI_CAPABLE ?
(block128_f)aesni_encrypt : (block128_f)aesni_encrypt :
(block128_f)AES_encrypt); (block128_f)AES_encrypt);
if (ctx->flags&EVP_CIPH_FLAG_LENGTH_BITS) {
CRYPTO_cfb128_1_encrypt(in,out,len,ctx->cipher_data,
ctx->iv,&ctx->num,ctx->encrypt,block);
return 1;
}
while (len>=MAXBITCHUNK) {
CRYPTO_cfb128_1_encrypt(in,out,MAXBITCHUNK*8,ctx->cipher_data,
ctx->iv,&ctx->num,ctx->encrypt,block);
len-=MAXBITCHUNK;
}
if (len)
CRYPTO_cfb128_1_encrypt(in,out,len*8,ctx->cipher_data,
ctx->iv,&ctx->num,ctx->encrypt,block);
return 1; return 1;
} }