diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2016-11-16 23:04:14 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-11-17 03:54:30 +0000 |
commit | c9a1525cdba39bfe1717773dda156fe6696102f8 (patch) | |
tree | 042648fa47e2112d6b748eae5fa40cf5c3167fb9 | |
parent | a4905bf6423105cda266ea3dfa70c207b4b7c2ac (diff) |
Add conversion test for MSBLOB format.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit d922634d0c63cee01c89869d79306cd2df628855)
-rw-r--r-- | test/recipes/15-test_dsa.t | 4 | ||||
-rw-r--r-- | test/recipes/15-test_rsa.t | 2 | ||||
-rw-r--r-- | test/recipes/tconversion.pl | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t index bf3b0d376a..2fd236e875 100644 --- a/test/recipes/15-test_dsa.t +++ b/test/recipes/15-test_dsa.t @@ -34,7 +34,7 @@ ok(run(test(["dsatest", "-app2_1"])), "running dsatest -app2_1"); tconversion("dsa", srctop_file("test","testdsa.pem"), "pkey"); }; subtest 'dsa conversions -- public key' => sub { - tconversion("dsa", srctop_file("test","testdsapub.pem"), "dsa", - "-pubin", "-pubout"); + tconversion("msb", srctop_file("test","testdsapub.pem"), "dsa", + "-pubin", "-pubout"); }; } diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t index cb1172a95f..a57ce63a90 100644 --- a/test/recipes/15-test_rsa.t +++ b/test/recipes/15-test_rsa.t @@ -35,7 +35,7 @@ ok(run(app([ 'openssl', 'rsa', '-check', '-in', srctop_file('test', 'testrsa.pem tconversion("rsa", srctop_file("test","testrsa.pem"), "pkey"); }; subtest 'rsa conversions -- public key' => sub { - tconversion("rsa", srctop_file("test","testrsapub.pem"), "rsa", + tconversion("msb", srctop_file("test","testrsapub.pem"), "rsa", "-pubin", "-pubout"); }; } diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl index e5fa9dec87..ee675e9327 100644 --- a/test/recipes/tconversion.pl +++ b/test/recipes/tconversion.pl @@ -19,6 +19,7 @@ my %conversionforms = ( # Default conversion forms. Other series may be added with # specific test types as key. "*" => [ "d", "p" ], + "msb" => [ "d", "p", "msblob" ], ); sub tconversion { my $testtype = shift; |