From 0c2c560cb96346737bace83eb01f8e8aa5970f81 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Mon, 11 May 2020 15:50:36 +0200 Subject: [PATCH] apps/storeutl: Add error output in case of parse/decryption/mac errors in input files Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/4930) --- apps/storeutl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/storeutl.c b/apps/storeutl.c index fcd874ea5d5..facbf633335 100644 --- a/apps/storeutl.c +++ b/apps/storeutl.c @@ -395,18 +395,20 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata, info == NULL ? NULL : OSSL_STORE_INFO_type_string(type); if (info == NULL) { - if (OSSL_STORE_eof(store_ctx)) - break; - if (OSSL_STORE_error(store_ctx)) { if (recursive) ERR_clear_error(); else ERR_print_errors(bio_err); + if (OSSL_STORE_eof(store_ctx)) + break; ret++; continue; } + if (OSSL_STORE_eof(store_ctx)) + break; + BIO_printf(bio_err, "ERROR: OSSL_STORE_load() returned NULL without " "eof or error indications\n"); -- 2.47.2