From a9fa32c2a082dc91fc2c2255c2ccef7dce0e9ee4 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 2 Jul 2021 12:13:47 +0200
Subject: [PATCH] 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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15980)
---
 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 0000000000000000000000000000000000000000..0249d6630a7c4752f945c88a705ac25d6fa3cf50
GIT binary patch
literal 308
zcmV-40n7de0ssI2qyPX?Q$aES0ssI30096!U9QOAOs+g{bjyIVhK3@e&|S&`yR{en
zPRO57Z~+*He9qse!NYA?v)JkW9Wdg%_)lvVmKkvsPev}OdfTd*{*iM`+wZ9|fuW;t
zd8qMoZ502as0N^DCEqGFXCU`QZpW^R@i*)@3n&J89G%%E5S$$;_nH#VOpu100sgRg
zLYlv{H+5l<taCP<=m6MJX?dAWr$xQfT5%m>X=I*pD9Xs&-%4rF{}YcCWA)&To5W0V
zu8VN^6&Ro)l3#|C4K#5m2E5o@Siwql@GS{GdkiQ*oLlP4&{I@|o++E5vO7nw+JYi+
z1{VUH$n@(V0pqX3DMQ9p$HR&Qgt`E#F<|nz{o#lOgnkte6ly)JQ5^|+q#5z{GuNTb
GCwFJK`;MIe

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..c311244d63b43deddff674da7d2f198a2b2349e4
GIT binary patch
literal 348
zcmV-i0i*sN@wKo300001000010000G0000q0RRA~{Ise|fO0lyG~&A8l<QUp0ssI2
zqyPZtHT}I_hc#P+k@stZ7<^)#*nv3@`+P&O`yqiHblCt@g6+dG)zq<AA!8?S*9rLZ
z7Bf}*h_?I8wM<;Pulky^EnpOnUIu1z(PO}C7FZs6KYJWubgCKE0`{>6QtHsiRzVU-
zQ(p*TY_}HU%qZP)JojjHvJxIO;uH>^SqOl{jv1zIDLj&&*c!+7sa<m5wx5jT2($->
zjXp6QRu;<yY=NVf*bZ}@V7=!!q*5WJ5%t!F!QR`J-xv;Vc3D75JKC{Hlpk|W)72V-
zJi)u26CslHSv6(&O=6|`-ylINlLhcKNeLqH_rh*`EDvL2tz>wDp!^gOE{z^(s^9A)
uoeU_@=D^-`!TLyG=@L_D=K#+9si<#k?O?!~+ubzMD75*%LrRUfa;?l!%b->O

literal 0
HcmV?d00001

-- 
2.34.1