root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix magic + 20 in PEM_ASN1_write_bio 

Fixes #26476

In the file crypto/pem/pem_lib.c the function had a +20 to account for
padding in the data size, however this was recognized to not be up to
standard quality. Instead it has now been updated to use the static
maximum block size and uses that for the calculation as opposed to a +20.

CLA: trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26526)
This commit is contained in:
Sean Kannanaikal 2025-01-22 07:38:47 -05:00 committed by Tomas Mraz
parent b6f2ff9363
commit a59efbfc7e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/pem/pem_lib.c
View File

@ -356,9 +356,8 @@ PEM_ASN1_write_bio_internal(
dsize = 0;
goto err;
}
/* dsize + 8 bytes are needed */
/* actually it needs the cipher block size extra... */
data = OPENSSL_malloc((unsigned int)dsize + 20);
/* Allocate enough space for one extra cipher block */
data = OPENSSL_malloc((unsigned int)dsize + EVP_MAX_BLOCK_LENGTH);
if (data == NULL)
goto err;
p = data;