[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  39f3427dc1cd8cf72cf4b3c8c26256874a067bfd (commit)
       via  3f6e891d423ed911eb779bfd1401a26ec18cfa41 (commit)
      from  e604b7c9156c66c05dd1640707f196f9fd49a184 (commit)


- Log -----------------------------------------------------------------
commit 39f3427dc1cd8cf72cf4b3c8c26256874a067bfd
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 14 00:00:41 2021 +0100

    Fix incomplete deprecation guard in test/sslapitest.c
    
    OPENSSL_NO_DEPRECATED_3_0 should be used rather than OPENSSL_NO_DEPRECATED,
    as the latter doesn't take the configuration option '--api=' in account.
    
    Fixes #13865
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13866)

commit 3f6e891d423ed911eb779bfd1401a26ec18cfa41
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 23:55:51 2021 +0100

    Fix crypto/des/build.info
    
    !$disabled{mdc2} was used to determine if DES files should be included
    in providers/liblegacy.a.  Use !$disabled{des} instead.
    
    Fixes #13865
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13866)

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

Summary of changes:
 crypto/des/build.info | 2 +-
 test/sslapitest.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/des/build.info b/crypto/des/build.info
index b73e740bec..ad8553a41a 100644
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -31,7 +31,7 @@ DEFINE[../../providers/liblegacy.a]=$DESDEF
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # DES functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{'deprecated-3.0'} && !$disabled{"mdc2"} -}]
+IF[{- $disabled{'deprecated-3.0'} && !$disabled{des} -}]
   SOURCE[../../providers/liblegacy.a]=$ALL
   DEFINE[../../providers/liblegacy.a]=$DESDEF
 ENDIF
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 984c6a8764..c6520482f6 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -8157,7 +8157,7 @@ static EVP_PKEY *get_tmp_dh_params(void)
     return tmp_dh_params;
 }
 
-#  ifndef OPENSSL_NO_DEPRECATED
+#  ifndef OPENSSL_NO_DEPRECATED_3_0
 /* Callback used by test_set_tmp_dh() */
 static DH *tmp_dh_callback(SSL *s, int is_export, int keylen)
 {