e_aes.c: additional sanity check in aes_xts_cipher.
authorAndy Polyakov <appro@openssl.org>
Sat, 12 Nov 2011 13:26:36 +0000 (13:26 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 12 Nov 2011 13:26:36 +0000 (13:26 +0000)
crypto/evp/e_aes.c

index 9db385f..cd0af63 100644 (file)
@@ -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 */