equal
deleted
inserted
replaced
|
1 --- openssl-1.0.1e/crypto/evp/e_aes.c Tue Jul 2 11:03:12 2013 |
|
2 +++ openssl-1.0.1e/crypto/evp/e_aes.c.new Tue Jul 2 11:04:56 2013 |
|
3 @@ -574,8 +574,11 @@ |
|
4 static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, |
|
5 const unsigned char *in, size_t len) |
|
6 { |
|
7 + size_t bl = ctx->cipher->block_size; |
|
8 EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data; |
|
9 |
|
10 + if (len<bl) return 1; |
|
11 + |
|
12 if (dat->stream.cbc) |
|
13 (*dat->stream.cbc)(in,out,len,&dat->ks,ctx->iv,ctx->encrypt); |
|
14 else if (ctx->encrypt) |