[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  38230e30118e434ca1c41d05d03fe2c41042d97d (commit)
      from  455f2542526ba3aa0db16dc8c4a5289d7f3e6b50 (commit)


- Log -----------------------------------------------------------------
commit 38230e30118e434ca1c41d05d03fe2c41042d97d
Author: Pauli <pauli at openssl.org>
Date:   Thu Apr 29 12:38:23 2021 +1000

    acvp: fix the no-acvp_test build
    
    A pair of the disabled string checks were incorrect.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15082)

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

Summary of changes:
 Configure                   | 2 +-
 INSTALL.md                  | 2 +-
 test/build.info             | 6 ++++--
 test/recipes/30-test_acvp.t | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Configure b/Configure
index 83c9a6f382..7acbbc56b9 100755
--- a/Configure
+++ b/Configure
@@ -379,7 +379,7 @@ my @dtls = qw(dtls1 dtls1_2);
 # For developers: keep it sorted alphabetically
 
 my @disablables = (
-    "acvp_tests",
+    "acvp-tests",
     "afalgeng",
     "aria",
     "asan",
diff --git a/INSTALL.md b/INSTALL.md
index f9b065d764..9414556427 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -521,7 +521,7 @@ never be used in production environments.  It will only work when used with
 gcc or clang and should be used in conjunction with the [no-shared](#no-shared)
 option.
 
-### no-acvp_tests
+### no-acvp-tests
 
 Do not build support for Automated Cryptographic Validation Protocol (ACVP)
 tests.
diff --git a/test/build.info b/test/build.info
index 8043f0d3be..98b94801e1 100644
--- a/test/build.info
+++ b/test/build.info
@@ -34,7 +34,7 @@ IF[{- !$disabled{tests} -}]
           destest mdc2test \
           exptest \
           evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
-          evp_fetch_prov_test acvp_test evp_libctx_test ossl_store_test \
+          evp_fetch_prov_test evp_libctx_test ossl_store_test \
           v3nametest v3ext \
           evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
           evp_fetch_prov_test v3nametest v3ext \
@@ -159,7 +159,9 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[evp_pkey_provided_test]=../include ../apps/include
   DEPEND[evp_pkey_provided_test]=../libcrypto.a libtestutil.a
 
-  IF[{- !$disabled{acvp-tests} -}]
+  IF[{- !$disabled{'acvp-tests'} -}]
+    PROGRAMS{noinst}=acvp_test
+
     SOURCE[acvp_test]=acvp_test.c
     INCLUDE[acvp_test]=../include ../apps/include
     DEPEND[acvp_test]=../libcrypto.a libtestutil.a
diff --git a/test/recipes/30-test_acvp.t b/test/recipes/30-test_acvp.t
index 8f36325f21..566c59d78e 100644
--- a/test/recipes/30-test_acvp.t
+++ b/test/recipes/30-test_acvp.t
@@ -19,7 +19,7 @@ setup("test_acvp");
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
 
 plan skip_all => "ACVP is not supported by this test"
-    if $no_fips || disabled("acvp_tests");
+    if $no_fips || disabled("acvp-tests");
 
 use lib srctop_dir('Configurations');
 use lib bldtop_dir('.');