diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-12-13 01:37:10 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-06 11:15:14 +0100 |
| commit | f4db05df0e0bc665b98e7cda33d4572071884d03 (patch) | |
| tree | ef99d0a49f76a9036f5383ff7d5a749a0e0a38a4 /crypto/engine | |
| parent | 5c64173586386a7c73e6431166c96eb43ae0baa2 (diff) | |
Adapt ENGINE_CONF_DEBUG to the new generic trace API
Co-authored-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_cnf.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index bece327cc5..c87a8a14b9 100644 --- a/crypto/engine/eng_cnf.c +++ b/crypto/engine/eng_cnf.c @@ -9,8 +9,7 @@ #include "eng_int.h" #include <openssl/conf.h> - -/* #define ENGINE_CONF_DEBUG */ +#include <openssl/trace.h> /* ENGINE config module */ @@ -50,9 +49,7 @@ static int int_engine_configure(const char *name, const char *value, const CONF int soft = 0; name = skip_dot(name); -#ifdef ENGINE_CONF_DEBUG - fprintf(stderr, "Configuring engine %s\n", name); -#endif + OSSL_TRACE1(ENGINE_CONF, "Configuring engine %s\n", name); /* Value is a section containing ENGINE commands */ ecmds = NCONF_get_section(cnf, value); @@ -66,10 +63,8 @@ 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; -#ifdef ENGINE_CONF_DEBUG - fprintf(stderr, "ENGINE conf: doing ctrl(%s,%s)\n", ctrlname, - ctrlvalue); -#endif + OSSL_TRACE2(ENGINE_CONF, "ENGINE conf: doing ctrl(%s,%s)\n", + ctrlname, ctrlvalue); /* First handle some special pseudo ctrls */ @@ -153,10 +148,8 @@ static int int_engine_module_init(CONF_IMODULE *md, const CONF *cnf) STACK_OF(CONF_VALUE) *elist; CONF_VALUE *cval; int i; -#ifdef ENGINE_CONF_DEBUG - fprintf(stderr, "Called engine module: name %s, value %s\n", - CONF_imodule_get_name(md), CONF_imodule_get_value(md)); -#endif + OSSL_TRACE2(ENGINE_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)); |