[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  66923436788d307c8e64cc392ffcd9631065eaa5 (commit)
      from  719bc0e826317d22c0687cf919e97749fa53d54a (commit)


- Log -----------------------------------------------------------------
commit 66923436788d307c8e64cc392ffcd9631065eaa5
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Fri Nov 27 14:59:18 2020 +1000

    Fix no-deprecated configuration
    
    pem_read_depr_test needed to be setup in build info so that it only
    exists inside an IF[{- !$disabled{'deprecated-3.0'} -}] block.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    (Merged from https://github.com/openssl/openssl/pull/13543)

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

Summary of changes:
 test/build.info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/build.info b/test/build.info
index 1485801e84..bd87bf6a94 100644
--- a/test/build.info
+++ b/test/build.info
@@ -57,8 +57,7 @@ IF[{- !$disabled{tests} -}]
           http_test servername_test ocspapitest fatalerrtest tls13ccstest \
           sysdefaulttest errtest ssl_ctx_test gosttest \
           context_internal_test aesgcmtest params_test evp_pkey_dparams_test \
-          keymgmt_internal_test hexstr_test provider_status_test defltfips_test \
-          pem_read_depr_test
+          keymgmt_internal_test hexstr_test provider_status_test defltfips_test
 
   IF[{- !$disabled{'deprecated-3.0'} -}]
     PROGRAMS{noinst}=enginetest
@@ -810,6 +809,7 @@ IF[{- !$disabled{tests} -}]
   DEPEND[bio_prefix_text]=../libcrypto
 
   IF[{- !$disabled{'deprecated-3.0'} -}]
+    PROGRAMS{noinst}=pem_read_depr_test
     SOURCE[pem_read_depr_test]=pem_read_depr_test.c
     INCLUDE[pem_read_depr_test]=../include ../apps/include
     DEPEND[pem_read_depr_test]=../libcrypto libtestutil.a