[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  d1a770414acd34c774248ce8efbe202fd7a44041 (commit)
      from  045a893091994a5837a2bec9cc5646ae9ff07a2c (commit)


- Log -----------------------------------------------------------------
commit d1a770414acd34c774248ce8efbe202fd7a44041
Author: Pauli <pauli at openssl.org>
Date:   Fri Apr 30 12:14:33 2021 +1000

    acvp-test: disable the ACVP testing code by default
    
    It's only useful for the FIPS lab and shouldn't be in production.
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15092)

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

Summary of changes:
 Configure  | 1 +
 INSTALL.md | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 7acbbc56b9..dc0b1924b7 100755
--- a/Configure
+++ b/Configure
@@ -513,6 +513,7 @@ my %deprecated_disablables = (
 
 our %disabled = ( # "what"         => "comment"
                   "fips"                => "default",
+                  "acvp-tests"          => "default",
                   "asan"                => "default",
                   "buildtest-c++"       => "default",
                   "crypto-mdebug"       => "default",
diff --git a/INSTALL.md b/INSTALL.md
index 9414556427..f89e1aed53 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -521,9 +521,9 @@ 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
+### enable-acvp-tests
 
-Do not build support for Automated Cryptographic Validation Protocol (ACVP)
+Build support for Automated Cryptographic Validation Protocol (ACVP)
 tests.
 
 This is required for FIPS validation purposes. Certain ACVP tests require