From: Jon Spillett <jon.spillett@oracle.com>
Date: Mon, 31 May 2021 03:14:24 +0000 (+1000)
Subject: Disable tracing within the FIPS module
X-Git-Tag: openssl-3.0.0-beta1~230
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c29b71c3676fda885619750add5f44dfd66c6d78;p=thirdparty%2Fopenssl.git

Disable tracing within the FIPS module

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15537)
---

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index 58e5cc8f11d..e88ad9d13d8 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -198,7 +198,7 @@ void OSSL_trace_end(int category, BIO *channel);
  * call OSSL_TRACE_CANCEL(category).
  */
 
-# ifndef OPENSSL_NO_TRACE
+# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
 
 #  define OSSL_TRACE_BEGIN(category) \
     do { \
@@ -237,7 +237,7 @@ void OSSL_trace_end(int category, BIO *channel);
  *         ...
  *     }
  */
-# ifndef OPENSSL_NO_TRACE
+# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
 
 #  define OSSL_TRACE_ENABLED(category) \
     OSSL_trace_enabled(OSSL_TRACE_CATEGORY_##category)