Use the same encryption growth macro consistently
authorMatt Caswell <matt@openssl.org>
Mon, 7 Nov 2022 12:02:08 +0000 (12:02 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 7 Nov 2022 17:12:01 +0000 (17:12 +0000)
commitecacbc5e3c48901417e8e05bbf1d29df78610607
tree5efbafd7babdd5437be4c073d1bf86f1ed6776f2
parente9e6827445528caf1d9d6647953fbe67a0c78716
Use the same encryption growth macro consistently

We had two different macros for calculating the potential growth due to
encryption. The macro we use for allocating the underlying buffer should be
the same one that we use for reserving bytes for encryption growth.

Also if we are adding the MAC independently of the cipher algorithm then
the encryption growth will not include that MAC so we should remove it
from the amount of bytes that we reserve for that growth. Otherwise we
might exceed our buffer size and the WPACKET_reserve operation will
fail.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19622)
ssl/record/methods/tls_common.c