diff options
| author | Matt Caswell <matt@openssl.org> | 2020-03-20 12:00:12 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-03-27 11:12:27 +0000 |
| commit | 5fcb97c61e6796b20c8ee1b0daab25151bf65bd0 (patch) | |
| tree | 8ae24140b4f7501baf529149b34ae49b8ee78a78 /crypto | |
| parent | 6b1e5fa4873ff2f7741f996961f26ab9818ee190 (diff) | |
Ignore some fetch failures
Some fetch failurs are ok and should be ignored.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11405)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index ecaaec41c7..da50ebf18a 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -226,8 +226,12 @@ static EVP_PKEY_CTX *int_ctx_new(OPENSSL_CTX *libctx, * If there's no engine and there's a name, we try fetching a provider * implementation. */ - if (e == NULL && keytype != NULL) + if (e == NULL && keytype != NULL) { + /* This could fail so ignore errors */ + ERR_set_mark(); keymgmt = EVP_KEYMGMT_fetch(libctx, keytype, propquery); + ERR_pop_to_mark(); + } ret = OPENSSL_zalloc(sizeof(*ret)); if (ret == NULL) { |