mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto/asn1/i2d_evp.c: Fix i2d_provided() to return a proper length

Browse Source 
Fixes #14258

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14291)
This commit is contained in:
Richard Levitte 2021-02-23 22:42:18 +01:00
parent c8182743a7
commit 1d73e2adae
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/asn1/i2d_evp.c
View File

@ -42,8 +42,10 @@ static int i2d_provided(const EVP_PKEY *a, int selection,
output_info++) {
/*
* The i2d_ calls don't take a boundary length for *pp. However,
* OSSL_ENCODER_CTX_get_num_encoders() needs one, so we make one
* up.
* OSSL_ENCODER_to_data() needs one, so we make one up. Because
* OSSL_ENCODER_to_data() decrements this number by the amount of
* bytes written, we need to calculate the length written further
* down, when pp != NULL.
*/
size_t len = INT_MAX;
@ -53,8 +55,12 @@ static int i2d_provided(const EVP_PKEY *a, int selection,
NULL);
if (ctx == NULL)
return -1;
if (OSSL_ENCODER_to_data(ctx, pp, &len))
ret = (int)len;
if (OSSL_ENCODER_to_data(ctx, pp, &len)) {
if (pp == NULL)
ret = (int)len;
else
ret = INT_MAX - (int)len;
}
OSSL_ENCODER_CTX_free(ctx);
ctx = NULL;
}