[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  aff96597363766402ada4291d31a7e84b22fb1e0 (commit)
      from  6597d62b8b95046370212bfd3c0767c970798085 (commit)


- Log -----------------------------------------------------------------
commit aff96597363766402ada4291d31a7e84b22fb1e0
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 14 09:07:29 2019 +0100

    Fix building with enable-trace
    
    Tracing doesn't work in the FIPS module. Ensure we switch it off there.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9159)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_ctx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index 882f3bc..4762114 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);