From: Dr. David von Oheimb Date: Wed, 22 Oct 2025 13:35:57 +0000 (+0200) Subject: apps/cmp.c: minor code refactoring on -no_cache_extracerts, tweak mock server error... X-Git-Tag: openssl-4.0.0~105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0635e07eb3d86e111a8c7ea9eab1e9a3b38e6f05;p=thirdparty%2Fopenssl.git apps/cmp.c: minor code refactoring on -no_cache_extracerts, tweak mock server error message Reviewed-by: Neil Horman Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/28973) (cherry picked from commit 3c15377ab8ec23673b3ecfc6b556ba70a7dde859) --- diff --git a/apps/cmp.c b/apps/cmp.c index c28627b2169..8921efe81ad 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -3784,8 +3784,7 @@ int cmp_main(int argc, char **argv) if (opt_ignore_keyusage) (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_IGNORE_KEYUSAGE, 1); if (opt_no_cache_extracerts) - (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS, - 1); + (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS, 1); if (opt_reqout_only == NULL && (opt_use_mock_srv #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP) @@ -3801,7 +3800,7 @@ int cmp_main(int argc, char **argv) srv_cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx); if (!OSSL_CMP_CTX_set_log_cb(srv_cmp_ctx, print_to_bio_err)) { - CMP_err1("Cannot set up error reporting and logging for %s", prog); + CMP_err1("Cannot set up server-side error reporting and logging for %s", prog); goto err; } OSSL_CMP_CTX_set_log_verbosity(srv_cmp_ctx, opt_verbosity);