From: Pauli Date: Tue, 14 Jul 2020 11:32:52 +0000 (+1000) Subject: trace: condition out engine related tracing X-Git-Tag: openssl-3.0.0-alpha5~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=184fb690fabe272a197f363144064141d369a192;p=thirdparty%2Fopenssl.git trace: condition out engine related tracing Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12226) --- diff --git a/crypto/trace.c b/crypto/trace.c index 18a8c641358..e6628f9baeb 100755 --- a/crypto/trace.c +++ b/crypto/trace.c @@ -126,8 +126,10 @@ static const struct trace_category_st trace_categories[] = { TRACE_CATEGORY_(TLS), TRACE_CATEGORY_(TLS_CIPHER), TRACE_CATEGORY_(CONF), +#ifndef OPENSSL_NO_ENGINE TRACE_CATEGORY_(ENGINE_TABLE), TRACE_CATEGORY_(ENGINE_REF_COUNT), +#endif TRACE_CATEGORY_(PKCS5V2), TRACE_CATEGORY_(PKCS12_KEYGEN), TRACE_CATEGORY_(PKCS12_DECRYPT), diff --git a/include/openssl/trace.h b/include/openssl/trace.h index f71d9fb4ca3..4f18e7526c1 100644 --- a/include/openssl/trace.h +++ b/include/openssl/trace.h @@ -42,8 +42,10 @@ extern "C" { # define OSSL_TRACE_CATEGORY_TLS 3 # define OSSL_TRACE_CATEGORY_TLS_CIPHER 4 # define OSSL_TRACE_CATEGORY_CONF 5 -# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6 -# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7 +# ifndef OPENSSL_NO_ENGINE +# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6 +# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7 +# endif # define OSSL_TRACE_CATEGORY_PKCS5V2 8 # define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN 9 # define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10