[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  79704a88eb5aa70fa506e3e59a29fcda21f428af (commit)
      from  8c870f6bed241ec80c67453e60592461f0d8f2b8 (commit)


- Log -----------------------------------------------------------------
commit 79704a88eb5aa70fa506e3e59a29fcda21f428af
Author: Shreenidhi Shedi <sshedi at vmware.com>
Date:   Wed Jan 12 20:55:38 2022 +0530

    Add a comment to indicate ineffective macro
    
    EVP_MD_CTX_FLAG_NON_FIPS_ALLOW macro is obsolete and unused from
    openssl-3.0 onwards
    
    CLA: trivial
    
    Signed-off-by: Shreenidhi Shedi <sshedi at vmware.com>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17484)

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

Summary of changes:
 include/openssl/evp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 1850381720..be57127e36 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -205,8 +205,8 @@ int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
  * don't accidentally reuse the values for other purposes.
  */
 
-# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008/* Allow use of non FIPS
-                                                * digest in FIPS mode */
+/* This flag has no effect from openssl-3.0 onwards */
+# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008
 
 /*
  * The following PAD options are also currently ignored in 1.0.0, digest