From: Andy Polyakov <appro@openssl.org>
Date: Sat, 12 Nov 2011 13:26:36 +0000 (+0000)
Subject: e_aes.c: additional sanity check in aes_xts_cipher.
X-Git-Tag: master-pre-reformat~2038
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32268b183f5f5d6912b4a8d8e2ee28b787373eb2;p=thirdparty%2Fopenssl.git

e_aes.c: additional sanity check in aes_xts_cipher.
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 9db385f90e8..cd0af63819e 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -1113,7 +1113,7 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
 	if (!xctx->xts.key1 || !xctx->xts.key2)
 		return 0;
-	if (!out || !in)
+	if (!out || !in || len<AES_BLOCK_SIZE)
 		return 0;
 #ifdef OPENSSL_FIPS
 	/* Requirement of SP800-38E */