From: Dr. David von Oheimb Date: Thu, 3 Aug 2023 14:52:49 +0000 (+0200) Subject: apps.c: fix error messages (newline and needless text) in load_key_certs_crls() X-Git-Tag: openssl-3.2.0-alpha1~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81d037b8adb0232c8a4d4654f79c883dafb102bc;p=thirdparty%2Fopenssl.git apps.c: fix error messages (newline and needless text) in load_key_certs_crls() Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/21659) --- diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 1acc991bb82..824ef16c2c1 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -987,7 +987,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin, if (!maybe_stdin) { if (!quiet) - BIO_printf(bio_err, "No filename or uri specified for loading"); + BIO_printf(bio_err, "No filename or uri specified for loading\n"); goto end; } uri = ""; @@ -1003,11 +1003,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin, ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata, params, NULL, NULL); } - if (ctx == NULL) { - if (!quiet) - BIO_printf(bio_err, "Could not open file or uri for loading"); + if (ctx == NULL) goto end; - } if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) goto end;