[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  8a5bd05da84ed635a8cb7a29004598e16f5dea70 (commit)
       via  c29b71c3676fda885619750add5f44dfd66c6d78 (commit)
      from  ea8215810319722cf76f777f812688eb3d632678 (commit)


- Log -----------------------------------------------------------------
commit 8a5bd05da84ed635a8cb7a29004598e16f5dea70
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Mon May 31 13:50:02 2021 +1000

    Add enable-fips to CI configuration
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15537)

commit c29b71c3676fda885619750add5f44dfd66c6d78
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Mon May 31 13:14:24 2021 +1000

    Disable tracing within the FIPS module
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15537)

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

Summary of changes:
 .github/workflows/run-checker-ci.yml | 2 +-
 include/openssl/trace.h              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 9a34e5d42e..4022778dd8 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -23,7 +23,7 @@ jobs:
           no-threads,
           no-tls,
           no-tls1_3,
-          enable-trace,
+          enable-trace enable-fips,
           no-ts,
           no-ui,
         ]
diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index 58e5cc8f11..e88ad9d13d 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)