[openssl/openssl] e1f099: Avoid ifdefs in trace categories

[Tomáš Mráz]

  Branch: refs/heads/openssl-3.1
  Home:   https://github.com/openssl/openssl
  Commit: e1f09938ca69b080467112efa3111213042ff8db
      https://github.com/openssl/openssl/commit/e1f09938ca69b080467112efa3111213042ff8db
  Author: Tomas Mraz <tomas at openssl.org>
  Date:   2022-12-22 (Thu, 22 Dec 2022)

  Changed paths:
    M crypto/trace.c
    M include/openssl/trace.h

  Log Message:
  -----------
  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 at oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19917)

(cherry picked from commit 78bd646b2f6a18cf8515e05a5f3efadff03b3920)


  Commit: cdc23b16bb562f002360ff216eb57344014857da
      https://github.com/openssl/openssl/commit/cdc23b16bb562f002360ff216eb57344014857da
  Author: Tomas Mraz <tomas at openssl.org>
  Date:   2022-12-22 (Thu, 22 Dec 2022)

  Changed paths:
    M test/trace_api_test.c

  Log Message:
  -----------
  Add testcase for OSSL_trace_set_callback()

Also test the OSSL_TRACE_CATEGORY_TRACE tracing - this fails
on address sanitizer runs without the fix for #19915

Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19917)

(cherry picked from commit e64a169fc678b5e57db28d06c25020d69bc61e4c)


Compare: https://github.com/openssl/openssl/compare/0c5fe6e4e740...cdc23b16bb56