mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check return value of ossl_parse_property()

Browse Source 
Also check if we have d2i_public_key() function pointer.

Fixes https://github.com/openssl/openssl/pull/18355#issuecomment-1144893289

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18462)
This commit is contained in:
Tomas Mraz 2022-06-02 16:50:15 +02:00
parent 697d0b5ba1
commit 4fa5ed5ce5
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/encode_decode/decoder_meth.c
View File

@ -191,8 +191,11 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
return NULL;
}
decoder->base.algodef = algodef;
decoder->base.parsed_propdef
= ossl_parse_property(libctx, algodef->property_definition);
if ((decoder->base.parsed_propdef
= ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
OSSL_DECODER_free(decoder);
return NULL;
}
for (; fns->function_id != 0; fns++) {
switch (fns->function_id) {

7
crypto/encode_decode/encoder_meth.c
View File

@ -191,8 +191,11 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
return NULL;
}
encoder->base.algodef = algodef;
encoder->base.parsed_propdef
= ossl_parse_property(libctx, algodef->property_definition);
if ((encoder->base.parsed_propdef
= ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
OSSL_ENCODER_free(encoder);
return NULL;
}
for (; fns->function_id != 0; fns++) {
switch (fns->function_id) {

2
providers/implementations/encode_decode/decode_der2key.c
View File

@ -227,7 +227,7 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
derp = der;
if (ctx->desc->d2i_PUBKEY != NULL)
key = ctx->desc->d2i_PUBKEY(NULL, &derp, der_len);
else
else if (ctx->desc->d2i_public_key != NULL)
key = ctx->desc->d2i_public_key(NULL, &derp, der_len);
if (key == NULL && ctx->selection != 0) {
ERR_clear_last_mark();