From bc362b9b72021c2a066102f4f6bee5afc981e07a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 5 Apr 2019 11:20:28 +0200 Subject: Convert the ENGINE_CONF trace calls to use CONF instead Additionally, merge ENGINE_CONF into CONF. Reviewed-by: Paul Dale Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/8680) --- crypto/engine/eng_cnf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/engine') diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index c87a8a14b9..9f647c4a9a 100644 --- a/crypto/engine/eng_cnf.c +++ b/crypto/engine/eng_cnf.c @@ -49,7 +49,7 @@ static int int_engine_configure(const char *name, const char *value, const CONF int soft = 0; name = skip_dot(name); - OSSL_TRACE1(ENGINE_CONF, "Configuring engine %s\n", name); + OSSL_TRACE1(CONF, "Configuring engine %s\n", name); /* Value is a section containing ENGINE commands */ ecmds = NCONF_get_section(cnf, value); @@ -63,7 +63,7 @@ static int int_engine_configure(const char *name, const char *value, const CONF ecmd = sk_CONF_VALUE_value(ecmds, i); ctrlname = skip_dot(ecmd->name); ctrlvalue = ecmd->value; - OSSL_TRACE2(ENGINE_CONF, "ENGINE conf: doing ctrl(%s,%s)\n", + OSSL_TRACE2(CONF, "ENGINE: doing ctrl(%s,%s)\n", ctrlname, ctrlvalue); /* First handle some special pseudo ctrls */ @@ -148,7 +148,7 @@ static int int_engine_module_init(CONF_IMODULE *md, const CONF *cnf) STACK_OF(CONF_VALUE) *elist; CONF_VALUE *cval; int i; - OSSL_TRACE2(ENGINE_CONF, "Called engine module: name %s, value %s\n", + OSSL_TRACE2(CONF, "Called engine module: name %s, value %s\n", CONF_imodule_get_name(md), CONF_imodule_get_value(md)); /* Value is a section containing ENGINEs to configure */ elist = NCONF_get_section(cnf, CONF_imodule_get_value(md)); -- cgit v1.2.3