From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Mon, 11 May 2020 13:50:36 +0000 (+0200)
Subject: apps/storeutl: Add error output in case of parse/decryption/mac errors in input files
X-Git-Tag: openssl-3.0.0-alpha9~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c2c560cb96346737bace83eb01f8e8aa5970f81;p=thirdparty%2Fopenssl.git

apps/storeutl: Add error output in case of parse/decryption/mac errors in input files

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)
---

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");