e_aes.c: prevent potential DoS in aes_gcm_tls_cipher.
authorAndy Polyakov <appro@openssl.org>
Sun, 23 Oct 2011 22:58:40 +0000 (22:58 +0000)
committerAndy Polyakov <appro@openssl.org>
Sun, 23 Oct 2011 22:58:40 +0000 (22:58 +0000)
crypto/evp/e_aes.c

index e3bd2b4..95d7421 100644 (file)
@@ -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.