OSSL_STORE: Prevent spurious error during loading private keys
@@ -206,34 +206,47 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
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;
if (ctx->desc->d2i_PUBKEY != NULL)
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
