rand: remove unimplemented librandom stub code

[openssl.git] / test / recipes / 15-test_rsa.t

diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index 2e8afa82138195f8134b18fa99811df2c8596539..e0ac15772a5bdd519704ae5b016f3241c6ba7404 100644 (file)
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -16,10 +16,7 @@ use OpenSSL::Test::Utils;
 
 setup("test_rsa");
 
-#plan skip_all => "RSA command line tool not built"
-#    if disabled("deprecated-3.0");
-
-plan tests => 10;
+plan tests => 14;
 
 require_ok(srctop_file('test', 'recipes', 'tconversion.pl'));
 
@@ -27,11 +24,7 @@ ok(run(test(["rsa_test"])), "running rsatest");
 
 run_rsa_tests("pkey");
 
- SKIP: {
-    skip "Skipping rsa command line tests", 4 if disabled('deprecated-3.0');
-
-    run_rsa_tests("rsa");
-}
+run_rsa_tests("rsa");
 
 sub run_rsa_tests {
     my $cmd = shift;
@@ -39,25 +32,48 @@ sub run_rsa_tests {
     ok(run(app([ 'openssl', $cmd, '-check', '-in', srctop_file('test', 'testrsa.pem'), '-noout'])),
            "$cmd -check" );
 
-     SKIP: {
+    SKIP: {
+        skip "Skipping Deprecated rsa_x931_test", 1 if disabled("deprecated-3.0");
+        ok(run(test(['rsa_x931_test'])), "RSA X931 test");
+    };
+
+    SKIP: {
          skip "Skipping $cmd conversion test", 3
-            if disabled("rsa");
+             if disabled("rsa");
 
          subtest "$cmd conversions -- private key" => sub {
-            tconversion($cmd, srctop_file("test", "testrsa.pem"));
+             tconversion( -type => $cmd, -prefix => "$cmd-priv",
+                          -in => srctop_file("test", "testrsa.pem") );
          };
          subtest "$cmd conversions -- private key PKCS#8" => sub {
-            tconversion($cmd, srctop_file("test", "testrsa.pem"), "pkey");
+             tconversion( -type => $cmd, -prefix => "$cmd-pkcs8",
+                          -in => srctop_file("test", "testrsa.pem"),
+                          -args => ["pkey"] );
          };
     }
 
-     SKIP: {
+    SKIP: {
          skip "Skipping msblob conversion test", 1
-            if disabled($cmd) || disabled("dsa") || $cmd == 'pkey';
+             if disabled($cmd) || $cmd eq 'pkey';
 
          subtest "$cmd conversions -- public key" => sub {
-            tconversion("msb", srctop_file("test", "testrsapub.pem"), "rsa",
-                        "-pubin", "-pubout");
+             tconversion( -type => 'msb', -prefix => "$cmd-msb-pub",
+                          -in => srctop_file("test", "testrsapub.pem"),
+                          -args => ["rsa", "-pubin", "-pubout"] );
+         };
+    }
+    SKIP: {
+         skip "Skipping PVK conversion test", 1
+             if disabled($cmd) || $cmd eq 'pkey' || disabled("rc4")
+                || disabled ("legacy");
+
+         subtest "$cmd conversions -- private key" => sub {
+             tconversion( -type => 'pvk', -prefix => "$cmd-pvk",
+                          -in => srctop_file("test", "testrsa.pem"),
+                          -args => ["rsa", "-passin", "pass:testpass",
+                                    "-passout", "pass:testpass",
+                                    "-provider", "default",
+                                    "-provider", "legacy"] );
          };
     }
 }