diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-12-15 11:45:48 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-01-11 15:06:38 +0100 |
| commit | 318a27d4e9aa785d98b9f55e910cfed8fc571404 (patch) | |
| tree | c93e960fd762f2ff79a168a37c1c424259122a29 /include/openssl | |
| parent | b4419635c992247cb4545054be664bf5218e7af4 (diff) | |
Avoid ifdefs in trace categories
The trace code assumes all categories are present and
the category numbers are equal to the index in the table.
Fixes #19915
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(cherry picked from commit 78bd646b2f6a18cf8515e05a5f3efadff03b3920)
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19958)
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/trace.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/openssl/trace.h b/include/openssl/trace.h index 2820013367..265c165c70 100644 --- a/include/openssl/trace.h +++ b/include/openssl/trace.h @@ -43,10 +43,8 @@ extern "C" { # define OSSL_TRACE_CATEGORY_TLS 3 # define OSSL_TRACE_CATEGORY_TLS_CIPHER 4 # define OSSL_TRACE_CATEGORY_CONF 5 -# ifndef OPENSSL_NO_ENGINE -# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6 -# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7 -# endif +# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6 +# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7 # define OSSL_TRACE_CATEGORY_PKCS5V2 8 # define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN 9 # define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10 |