diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-28 16:14:14 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-30 20:49:44 +0200 |
| commit | 66066e1bba041459c2f879666b79e4a2158f5905 (patch) | |
| tree | 3ad2f2014c9a05cd720746fe601dc6500c8b6946 /crypto/store | |
| parent | 9032c2c11b2f14dcdbd253b470abc595a07a6c51 (diff) | |
Prune low-level ASN.1 parse errors from error queue in der2key_decode() etc.
Also adds error output tests on loading key files with unsupported algorithms to 30-test_evp.t
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13023)
Diffstat (limited to 'crypto/store')
| -rw-r--r-- | crypto/store/store_result.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index c3f21eedad..363d25adbf 100644 --- a/crypto/store/store_result.c +++ b/crypto/store/store_result.c @@ -88,6 +88,7 @@ static int try_pkcs12(struct extracted_param_data_st *, OSSL_STORE_INFO **, \ if (ERR_GET_LIB(err) == ERR_LIB_ASN1 \ && (ERR_GET_REASON(err) == ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE \ + || ERR_GET_REASON(err) == ASN1_R_NO_MATCHING_CHOICE_TYPE \ || ERR_GET_REASON(err) == ERR_R_NESTED_ASN1_ERROR)) \ ERR_pop_to_mark(); \ else \ |