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

Encoder : Fix floating pointer when OSSL_ENCODER_to_data() is called

Browse Source 
twice.

Fixes #26862

This only happens when using the FIPS provider, since it needs to export
the key.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26891)

(cherry picked from commit c2f4d7aae1c7c726eb1f8226d3d454dfd9754758)
This commit is contained in:
slontis 2025-02-25 17:03:38 +11:00 committed by Tomas Mraz
parent 23cdc77328
commit fe3690760f
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/encode_decode/encoder_pkey.c
View File

@ -207,6 +207,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
static void encoder_destruct_pkey(void *arg)
{
struct construct_data_st *data = arg;
int match = (data->obj == data->constructed_obj);
if (data->encoder_inst != NULL) {
OSSL_ENCODER *encoder =
@ -215,6 +216,8 @@ static void encoder_destruct_pkey(void *arg)
encoder->free_object(data->constructed_obj);
}
data->constructed_obj = NULL;
if (match)
data->obj = NULL;
}
/*

23
test/endecode_test.c
View File

@ -1241,6 +1241,28 @@ static int create_ec_explicit_trinomial_params(OSSL_PARAM_BLD *bld)
return do_create_ec_explicit_trinomial_params(bld, gen2, sizeof(gen2));
}
# endif /* OPENSSL_NO_EC2M */
/*
* Test that multiple calls to OSSL_ENCODER_to_data() do not cause side effects
*/
static int ec_encode_to_data_multi(void)
{
int ret;
OSSL_ENCODER_CTX *ectx = NULL;
EVP_PKEY *key = NULL;
uint8_t *enc = NULL;
size_t enc_len = 0;
ret = TEST_ptr(key = EVP_PKEY_Q_keygen(testctx, "", "EC", "P-256"))
&& TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(key, EVP_PKEY_KEYPAIR,
"DER", NULL, NULL))
&& TEST_int_eq(OSSL_ENCODER_to_data(ectx, NULL, &enc_len), 1)
&& TEST_int_eq(OSSL_ENCODER_to_data(ectx, &enc, &enc_len), 1);
OPENSSL_free(enc);
EVP_PKEY_free(key);
OSSL_ENCODER_CTX_free(ectx);
return ret;
}
#endif /* OPENSSL_NO_EC */
typedef enum OPTION_choice {
@ -1421,6 +1443,7 @@ int setup_tests(void)
# endif
#endif
#ifndef OPENSSL_NO_EC
ADD_TEST(ec_encode_to_data_multi);
ADD_TEST_SUITE(EC);
ADD_TEST_SUITE_PARAMS(EC);
ADD_TEST_SUITE_LEGACY(EC);