X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_aes.c;h=95d7421168296ed96ff6d2306725ed0f6aa096c2;hp=e3bd2b498221bedd9ab11776d652e4806f172825;hb=507b0d9d38486dbde08d7dc359d2d6fc904ee624;hpb=181fbb77f3357f403b9635c10b696a2165328f27;ds=sidebyside

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index e3bd2b4982..95d7421168 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -940,7 +940,7 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
 	int rv = -1;
 	/* Encrypt/decrypt must be performed in place */
-	if (out != in)
+	if (out != in || len < (EVP_GCM_TLS_EXPLICIT_IV_LEN+EVP_GCM_TLS_TAG_LEN))
 		return -1;
 	/* Set IV from start of buffer or generate IV and write to start
 	 * of buffer.