[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  92d7120c60cea7c9e0219921c2cc2320346218b2 (commit)
      from  6a74852907983112da9fbfd98a7b83cbdb682b3c (commit)


- Log -----------------------------------------------------------------
commit 92d7120c60cea7c9e0219921c2cc2320346218b2
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Thu Jul 1 12:01:22 2021 +1000

    Fix compile errors when building with --api=1.1.0 no-deprecated.
    
    Fixes #15963
    
    INSTALL.md uses these exact options as an example so it should work.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15965)

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

Summary of changes:
 crypto/bn/build.info      | 5 ++++-
 test/pem_read_depr_test.c | 3 +++
 test/sslapitest.c         | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index c3c71884e5..40d7db9f50 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -108,8 +108,11 @@ $COMMON=bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c \
         bn_intern.c bn_dh.c bn_rsa_fips186_4.c bn_const.c
 SOURCE[../../libcrypto]=$COMMON $BNASM bn_print.c bn_err.c bn_srp.c
 DEFINE[../../libcrypto]=$BNDEF
+IF[{- !$disabled{'deprecated-0.9.8'} -}]
+  SOURCE[../../libcrypto]=bn_depr.c
+ENDIF
 IF[{- !$disabled{'deprecated-3.0'} -}]
-  SOURCE[../../libcrypto]=bn_depr.c bn_x931p.c
+  SOURCE[../../libcrypto]=bn_x931p.c
 ENDIF
 SOURCE[../../providers/libfips.a]=$COMMON $BNASM
 DEFINE[../../providers/libfips.a]=$BNDEF
diff --git a/test/pem_read_depr_test.c b/test/pem_read_depr_test.c
index 7ef7f30be6..b6a518873a 100644
--- a/test/pem_read_depr_test.c
+++ b/test/pem_read_depr_test.c
@@ -15,6 +15,9 @@
 
 #include <openssl/pem.h>
 #include <openssl/bio.h>
+#include <openssl/dh.h>
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
 
 #include "testutil.h"
 
diff --git a/test/sslapitest.c b/test/sslapitest.c
index bbb1cf91f4..1b3db55d6b 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -32,6 +32,7 @@
 #include <openssl/provider.h>
 #include <openssl/param_build.h>
 #include <openssl/x509v3.h>
+#include <openssl/dh.h>
 
 #include "helpers/ssltestlib.h"
 #include "testutil.h"