[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  be3acd799bfd0fb09ea934e4984ec9eda19d8b8f (commit)
      from  14ee781eef0e55563432f377d8911529823bee58 (commit)


- Log -----------------------------------------------------------------
commit be3acd799bfd0fb09ea934e4984ec9eda19d8b8f
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Sat Nov 23 08:54:29 2019 +0100

    Fix typos in fipsinstall test
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10506)

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

Summary of changes:
 test/recipes/03-test_fipsinstall.t    | 22 +++++++++++-----------
 test/recipes/30-test_evp.t            |  2 +-
 test/recipes/30-test_evp_fetch_prov.t |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index 6f7c38a124..40a962253d 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -29,19 +29,19 @@ plan tests => 6;
 my $infile = bldtop_file('providers', platform->dso('fips'));
 $ENV{OPENSSL_MODULES} = bldtop_dir("providers");
 
-#fail if no module name
+# fail if no module name
 ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module',
              '-provider_name', 'fips',
              '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
              '-section_name', 'fips_install'])),
-   "fipinstall fail");
+   "fipsinstall fail");
 
-# fail to Verify if the configuration file is missing
+# fail to verify if the configuration file is missing
 ok(!run(app(['openssl', 'fipsinstall', '-in', 'dummy.tmp', '-module', $infile,
              '-provider_name', 'fips', '-mac_name', 'HMAC',
              '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
              '-section_name', 'fips_install', '-verify'])),
-   "fipinstall verify fail");
+   "fipsinstall verify fail");
 
 
 # output a fips.conf file containing mac data
@@ -49,25 +49,25 @@ ok(run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
             '-provider_name', 'fips', '-mac_name', 'HMAC',
             '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
             '-section_name', 'fips_install'])),
-   "fipinstall");
+   "fipsinstall");
 
-# Verify the fips.conf file
+# verify the fips.conf file
 ok(run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
             '-provider_name', 'fips', '-mac_name', 'HMAC',
             '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
             '-section_name', 'fips_install', '-verify'])),
-   "fipinstall verify");
+   "fipsinstall verify");
 
-# Fail to Verify the fips.conf file if a different key is used
+# fail to verify the fips.conf file if a different key is used
 ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
              '-provider_name', 'fips', '-mac_name', 'HMAC',
              '-macopt', 'digest:SHA256', '-macopt', 'hexkey:01',
              '-section_name', 'fips_install', '-verify'])),
-   "fipinstall verify fail bad key");
+   "fipsinstall verify fail bad key");
 
-# Fail to Verify the fips.conf file if a different mac digest is used
+# fail to verify the fips.conf file if a different mac digest is used
 ok(!run(app(['openssl', 'fipsinstall', '-in', 'fips.conf', '-module', $infile,
              '-provider_name', 'fips', '-mac_name', 'HMAC',
              '-macopt', 'digest:SHA512', '-macopt', 'hexkey:00',
              '-section_name', 'fips_install', '-verify'])),
-   "fipinstall verify fail incorrect digest");
+   "fipsinstall verify fail incorrect digest");
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 979811b0e6..23c4aa8620 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -83,7 +83,7 @@ unless ($no_fips) {
                 '-provider_name', 'fips', '-mac_name', 'HMAC',
                 '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
                 '-section_name', 'fips_sect'])),
-       "fipinstall");
+       "fipsinstall");
 }
 
 foreach (@configs) {
diff --git a/test/recipes/30-test_evp_fetch_prov.t b/test/recipes/30-test_evp_fetch_prov.t
index d7a44ec306..82d984353b 100644
--- a/test/recipes/30-test_evp_fetch_prov.t
+++ b/test/recipes/30-test_evp_fetch_prov.t
@@ -53,7 +53,7 @@ unless ($no_fips) {
                         '-provider_name', 'fips', '-mac_name', 'HMAC',
                         '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
                         '-section_name', 'fips_sect']),
-        message => "fipinstall"
+        message => "fipsinstall"
     };
     push @testdata, (
         { config    => srctop_file("test", "fips.cnf"),