wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sanity check lengths for AES wrap algorithm.

Browse source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit d12eef1501)
This commit is contained in:
Dr. Stephen Henson 2014-07-17 02:50:48 +01:00
parent 6ccd120f5f
commit 6e1e5996df
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/evp/e_aes.c
View file

@ -2076,7 +2076,11 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
EVP_AES_WRAP_CTX *wctx = ctx->cipher_data;
size_t rv;
if (inlen % 8)
return 0;
return -1;
if (ctx->encrypt && inlen < 8)
return -1;
if (!ctx->encrypt && inlen < 16)
return -1;
if (!out)
{
if (ctx->encrypt)

2
crypto/modes/wrap128.c
View file

@ -106,7 +106,7 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
unsigned char *A, B[16], *R;
size_t i, j, t;
inlen -= 8;
if ((inlen & 0x7) || (inlen < 8) || (inlen > CRYPTO128_WRAP_MAX))
if ((inlen & 0x7) || (inlen < 16) || (inlen > CRYPTO128_WRAP_MAX))
return 0;
A = B;
t = 6 * (inlen >> 3);