From: Matt Caswell <matt@openssl.org>
Date: Fri, 14 Jun 2019 08:07:29 +0000 (+0100)
Subject: Fix building with enable-trace
X-Git-Tag: openssl-3.0.0-alpha1~1943
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aff96597363766402ada4291d31a7e84b22fb1e0;p=oweals%2Fopenssl.git

Fix building with enable-trace

Tracing doesn't work in the FIPS module. Ensure we switch it off there.

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

diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index 882f3bc06e..476211411a 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c
@@ -166,6 +166,7 @@ void BN_CTX_free(BN_CTX *ctx)
 {
     if (ctx == NULL)
         return;
+#ifndef FIPS_MODE
     OSSL_TRACE_BEGIN(BN_CTX) {
         BN_POOL_ITEM *pool = ctx->pool.head;
         BIO_printf(trc_out,
@@ -180,6 +181,7 @@ void BN_CTX_free(BN_CTX *ctx)
         }
         BIO_printf(trc_out, "\n");
     } OSSL_TRACE_END(BN_CTX);
+#endif
     BN_STACK_finish(&ctx->stack);
     BN_POOL_finish(&ctx->pool);
     OPENSSL_free(ctx);