diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-03-17 19:17:03 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-03-19 16:46:39 +0100 |
| commit | c640b687855de512138d4c4b09b71c080c0adfeb (patch) | |
| tree | 4942b5a8187e857f030b85a733eb4acd5a00f5d2 /providers | |
| parent | ff1c10d920379854a80d43b69a58e20f1e76e76c (diff) | |
STORE: Use the same error avoidance criteria as for the DER->key decoder
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14314)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/storemgmt/file_store_der2obj.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/providers/implementations/storemgmt/file_store_der2obj.c b/providers/implementations/storemgmt/file_store_der2obj.c index 74fa40df9f..a36e9ab003 100644 --- a/providers/implementations/storemgmt/file_store_der2obj.c +++ b/providers/implementations/storemgmt/file_store_der2obj.c @@ -101,7 +101,9 @@ static int der2obj_decode(void *provctx, OSSL_CORE_BIO *cin, int selection, err = ERR_peek_last_error(); if (ERR_GET_LIB(err) == ERR_LIB_ASN1 && (ERR_GET_REASON(err) == ASN1_R_HEADER_TOO_LONG - || ERR_GET_REASON(err) == ERR_R_NESTED_ASN1_ERROR)) + || ERR_GET_REASON(err) == ASN1_R_UNSUPPORTED_TYPE + || ERR_GET_REASON(err) == ERR_R_NESTED_ASN1_ERROR + || ERR_GET_REASON(err) == ASN1_R_NOT_ENOUGH_DATA)) ERR_pop_to_mark(); else ERR_clear_last_mark(); |