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

Convert the ENGINE_CONF trace calls to use CONF instead 



Additionally, merge ENGINE_CONF into CONF.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8680)
parent 0196ad63

crypto/engine/eng_cnf.c

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

crypto/trace.c

+1 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static const struct trace_category_st trace_categories[] = { 
    TRACE_CATEGORY_(INIT),

    TRACE_CATEGORY_(TLS),

    TRACE_CATEGORY_(TLS_CIPHER),

    TRACE_CATEGORY_(ENGINE_CONF),

    TRACE_CATEGORY_(CONF),

    TRACE_CATEGORY_(ENGINE_TABLE),

    TRACE_CATEGORY_(ENGINE_REF_COUNT),

    TRACE_CATEGORY_(PKCS5V2),
@@ -132,7 +132,6 @@ static const struct trace_category_st trace_categories[] = { 
    TRACE_CATEGORY_(PKCS12_DECRYPT),

    TRACE_CATEGORY_(X509V3_POLICY),

    TRACE_CATEGORY_(BN_CTX),

    TRACE_CATEGORY_(CONF),

};



const char *OSSL_trace_get_category_name(int num)

include/openssl/trace.h

+2 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern "C" { 
# define OSSL_TRACE_CATEGORY_INIT                2

# define OSSL_TRACE_CATEGORY_TLS                 3

# define OSSL_TRACE_CATEGORY_TLS_CIPHER          4

# define OSSL_TRACE_CATEGORY_ENGINE_CONF         5

# define OSSL_TRACE_CATEGORY_CONF                5

# define OSSL_TRACE_CATEGORY_ENGINE_TABLE        6

# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT    7

# define OSSL_TRACE_CATEGORY_PKCS5V2             8
@@ -49,8 +49,7 @@ extern "C" { 
# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT     10

# define OSSL_TRACE_CATEGORY_X509V3_POLICY      11

# define OSSL_TRACE_CATEGORY_BN_CTX             12

# define OSSL_TRACE_CATEGORY_CONF               13

# define OSSL_TRACE_CATEGORY_NUM                14

# define OSSL_TRACE_CATEGORY_NUM                13



/* Returns the trace category number for the given |name| */

int OSSL_trace_get_category_num(const char *name);