[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a9fa32c2a082dc91fc2c2255c2ccef7dce0e9ee4 (commit)
      from  3c0d0eca3505aabe14024e3dd269dee3692ba1ce (commit)


- Log -----------------------------------------------------------------
commit a9fa32c2a082dc91fc2c2255c2ccef7dce0e9ee4
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 2 12:13:47 2021 +0200

    TEST: Add testing of PVK and MSBLOB files to test_store
    
    The PVK and MSBLOB files were generated using openssl 1.1.1, using
    test/testrsa.pem as source:
    
        openssl rsa -in test/testrsa.pem \
                    -out test/recipes/90-test_store_data/testrsa.msb \
                    -outform msb
        openssl rsa -in test/testrsa.pem \
                    -out test/recipes/90-test_store_data/testrsa.pvk \
                    -outform pvk \
                    -passout pass:password
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15980)

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

Summary of changes:
 test/recipes/90-test_store.t                |  22 ++++++++++++++++++----
 test/recipes/90-test_store_data/testrsa.msb | Bin 0 -> 308 bytes
 test/recipes/90-test_store_data/testrsa.pvk | Bin 0 -> 348 bytes
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 test/recipes/90-test_store_data/testrsa.msb
 create mode 100644 test/recipes/90-test_store_data/testrsa.pvk

diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t
index 835ad6191e..2bdc08f4c2 100644
--- a/test/recipes/90-test_store.t
+++ b/test/recipes/90-test_store.t
@@ -30,6 +30,11 @@ my @src_files =
       "test/testrsapub.pem",
       "test/testcrl.pem",
       "apps/server.pem" );
+my @data_files =
+    ( "testrsa.msb" );
+push(@data_files,
+     ( "testrsa.pvk" ))
+    unless disabled("legacy") || disabled("rc4");
 my @src_rsa_files =
     ( "test/testrsa.pem",
       "test/testrsapub.pem" );
@@ -104,6 +109,7 @@ push @methods, [qw(-engine loader_attic)]
 my $n = scalar @methods
     * ( (3 * scalar @noexist_files)
         + (6 * scalar @src_files)
+        + (2 * scalar @data_files)
         + (4 * scalar @generated_files)
         + (scalar keys %generated_file_files)
         + (scalar @noexist_file_files)
@@ -192,11 +198,19 @@ indir "store_$$" => sub {
                                  to_abs_file_uri($file, 0, "dummy")])));
                 }
             }
+            foreach (@data_files) {
+                my $file = data_file($_);
+
+                ok(run(app([@storeutl, "-noout", "-passin", "pass:password",
+                            $file])));
+                ok(run(app([@storeutl, "-noout", "-passin", "pass:password",
+                            to_abs_file($file)])));
+            }
             foreach (@generated_files) {
-                ok(run(app([@storeutl, "-noout", "-passin",
-                            "pass:password", $_])));
-                ok(run(app([@storeutl,  "-noout", "-passin",
-                            "pass:password", to_abs_file($_)])));
+                ok(run(app([@storeutl, "-noout", "-passin", "pass:password",
+                            $_])));
+                ok(run(app([@storeutl,  "-noout", "-passin", "pass:password",
+                            to_abs_file($_)])));
 
               SKIP:
                 {
diff --git a/test/recipes/90-test_store_data/testrsa.msb b/test/recipes/90-test_store_data/testrsa.msb
new file mode 100644
index 0000000000..0249d6630a
Binary files /dev/null and b/test/recipes/90-test_store_data/testrsa.msb differ
diff --git a/test/recipes/90-test_store_data/testrsa.pvk b/test/recipes/90-test_store_data/testrsa.pvk
new file mode 100644
index 0000000000..c311244d63
Binary files /dev/null and b/test/recipes/90-test_store_data/testrsa.pvk differ