Prune low-level ASN.1 parse errors from error queue in der2key_decode() etc.

[openssl.git] / crypto / store / store_result.c

diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index c3f21eedadcc3036dfce35bdb7a5991d9c35e65b..363d25adbf1982325eae7b78fd65cb6fff84c0ee 100644 (file)
--- 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                                                            \