From f4db05df0e0bc665b98e7cda33d4572071884d03 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 13 Dec 2018 01:37:10 +0100 Subject: [PATCH] Adapt ENGINE_CONF_DEBUG to the new generic trace API Co-authored-by: Dr. Matthias St. Pierre Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8198) --- crypto/engine/eng_cnf.c | 19 ++++++------------- crypto/trace.c | 1 + include/openssl/trace.h | 3 ++- 3 files changed, 9 insertions(+), 14 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 - -/* #define ENGINE_CONF_DEBUG */ +#include /* 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)); diff --git a/crypto/trace.c b/crypto/trace.c index b42f1d9a22..c76eb5110e 100644 --- a/crypto/trace.c +++ b/crypto/trace.c @@ -123,6 +123,7 @@ static const struct trace_category_st trace_categories[] = { TRACE_CATEGORY_(INIT), TRACE_CATEGORY_(TLS), TRACE_CATEGORY_(TLS_CIPHER), + TRACE_CATEGORY_(ENGINE_CONF), }; const char *OSSL_trace_get_category_name(int num) diff --git a/include/openssl/trace.h b/include/openssl/trace.h index ecabeb09ab..96934eda8e 100644 --- a/include/openssl/trace.h +++ b/include/openssl/trace.h @@ -36,7 +36,8 @@ extern "C" { # define OSSL_TRACE_CATEGORY_INIT 1 # define OSSL_TRACE_CATEGORY_TLS 2 # define OSSL_TRACE_CATEGORY_TLS_CIPHER 3 -# define OSSL_TRACE_CATEGORY_NUM 4 +# define OSSL_TRACE_CATEGORY_ENGINE_CONF 4 +# define OSSL_TRACE_CATEGORY_NUM 5 /* Returns the trace category number for the given |name| */ int OSSL_trace_get_category_num(const char *name); -- 2.25.1