[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  454d69271cf65edb1f6d0ca2a06f9b755f6cb937 (commit)
      from  59a783d05ae379335f70261126d19859ae5a855d (commit)


- Log -----------------------------------------------------------------
commit 454d69271cf65edb1f6d0ca2a06f9b755f6cb937
Author: Tomas Mraz <tomas at openssl.org>
Date:   Wed Jun 23 17:16:36 2021 +0200

    trace: Do not produce dead code calling BIO_printf if disabled
    
    Fixes #15880
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15882)

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

Summary of changes:
 include/openssl/trace.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index e88ad9d13d..b3a29ea8c4 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -270,11 +270,19 @@ void OSSL_trace_end(int category, BIO *channel);
  *                42, "What do you get when you multiply six by nine?");
  */
 
-# define OSSL_TRACEV(category, args) \
+# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
+
+#  define OSSL_TRACEV(category, args) \
     OSSL_TRACE_BEGIN(category) \
         BIO_printf args; \
     OSSL_TRACE_END(category)
 
+# else
+
+#  define OSSL_TRACEV(category, args) ((void)0)
+
+# endif
+
 # define OSSL_TRACE(category, text) \
     OSSL_TRACEV(category, (trc_out, "%s", text))