summaryrefslogtreecommitdiffstats
path: root/crypto/trace.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-04-05 11:20:28 +0200
committerRichard Levitte <levitte@openssl.org>2019-04-05 12:50:55 +0200
commitbc362b9b72021c2a066102f4f6bee5afc981e07a (patch)
treeee28ae56a88604e650e10ef55ce21f5b7db1175f /crypto/trace.c
parent0196ad63d385bcf4382266268d5be074461d3739 (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/trace.c')
-rw-r--r--crypto/trace.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/trace.c b/crypto/trace.c
index ac383fac9a..ecfc6d4e31 100644
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -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)