diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-04-05 11:20:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-04-05 12:50:55 +0200 |
| commit | bc362b9b72021c2a066102f4f6bee5afc981e07a (patch) | |
| tree | ee28ae56a88604e650e10ef55ce21f5b7db1175f /crypto/engine | |
| parent | 0196ad63d385bcf4382266268d5be074461d3739 (diff) | |
Convert the ENGINE_CONF trace calls to use CONF instead
Additionally, merge ENGINE_CONF into CONF.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8680)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_cnf.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); |