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

OSSL_STORE: Prevent spurious error during loading private keys

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15283)
This commit is contained in:
Dr. David von Oheimb 2021-05-14 15:11:00 +02:00 committed by Dr. David von Oheimb
parent e304aa87b3
commit da198adb9c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,19 +204,24 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
if (!ok)
goto next;
ok = 0; /* Assume that we fail */
ok = 0; /* Assume that we fail */
ERR_set_mark();
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
derp = der;
if (ctx->desc->d2i_PKCS8 != NULL) {
key = ctx->desc->d2i_PKCS8(NULL, &derp, der_len, ctx);
if (ctx->flag_fatal)
if (ctx->flag_fatal) {
ERR_clear_last_mark();
goto end;
}
} else if (ctx->desc->d2i_private_key != NULL) {
key = ctx->desc->d2i_private_key(NULL, &derp, der_len);
}
if (key == NULL && ctx->selection != 0)
if (key == NULL && ctx->selection != 0) {
ERR_clear_last_mark();
goto next;
}
}
if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
derp = der;
@ -224,16 +229,24 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
key = ctx->desc->d2i_PUBKEY(NULL, &derp, der_len);
else
key = ctx->desc->d2i_public_key(NULL, &derp, der_len);
if (key == NULL && ctx->selection != 0)
if (key == NULL && ctx->selection != 0) {
ERR_clear_last_mark();
goto next;
}
}
if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_ALL_PARAMETERS) != 0) {
derp = der;
if (ctx->desc->d2i_key_params != NULL)
key = ctx->desc->d2i_key_params(NULL, &derp, der_len);
if (key == NULL && ctx->selection != 0)
if (key == NULL && ctx->selection != 0) {
ERR_clear_last_mark();
goto next;
}
}
if (key == NULL)
ERR_clear_last_mark();
else
ERR_pop_to_mark();
/*
* Last minute check to see if this was the correct type of key. This