Commit f4db05df authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt ENGINE_CONF_DEBUG to the new generic trace API 



Co-authored-by: default avatarDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
parent 5c641735

crypto/engine/eng_cnf.c

+6 −13
Original line number Diff line number Diff line
@@ -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",

    OSSL_TRACE2(ENGINE_CONF, "Called engine module: name %s, value %s\n",

                CONF_imodule_get_name(md), CONF_imodule_get_value(md));

#endif

    /* Value is a section containing ENGINEs to configure */

    elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));

crypto/trace.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

include/openssl/trace.h

+2 −1
Original line number Diff line number Diff line
@@ -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);