From: Pauli <pauli@openssl.org>
Date: Wed, 26 May 2021 00:24:40 +0000 (+1000)
Subject: test: test MP genrsa in deprecated builds
X-Git-Tag: openssl-3.0.0-beta1~354
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422da9bbfb739a5d42292c990c0b81552060d5a2;p=thirdparty%2Fopenssl.git

test: test MP genrsa in deprecated builds

These multi-prime tests were omitted when genrsa was deprecated but not
returned when it was restored.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15472)
---

diff --git a/test/recipes/15-test_mp_rsa.t b/test/recipes/15-test_mp_rsa.t
index ad7018789bb..339a2a811db 100644
--- a/test/recipes/15-test_mp_rsa.t
+++ b/test/recipes/15-test_mp_rsa.t
@@ -35,14 +35,14 @@ my @test_param = (
     },
 );
 
-plan tests => 1 + scalar(@test_param) * 5 * (disabled('deprecated-3.0') ? 1 : 2);
+plan tests => 1 + scalar(@test_param) * 5 * 2;
 
 ok(run(test(["rsa_mp_test"])), "running rsa multi prime test");
 
 my $cleartext = data_file("plain_text");
 
 # genrsa
-run_mp_tests(0) if !disabled('deprecated-3.0');
+run_mp_tests(0);
 # evp
 run_mp_tests(1);
 
@@ -77,14 +77,25 @@ sub run_mp_tests {
             ok(run(app([ 'openssl', 'rsa', '-check',
                          '-in', "rsamptest-$name.pem", '-noout'])),
                "rsa -check $name");
-            ok(run(app([ 'openssl', 'rsautl', '-inkey', "rsamptest-$name.pem",
-                         '-encrypt', '-in', $cleartext,
-                         '-out', "rsamptest-$name.enc" ])),
-               "rsa $name encrypt");
-            ok(run(app([ 'openssl', 'rsautl', '-inkey', "rsamptest-$name.pem",
-                         '-decrypt', '-in', "rsamptest-$name.enc",
-                         '-out', "rsamptest-$name.dec" ])),
-               "rsa $name decrypt");
+            if (!disabled('deprecated-3.0')) {
+                ok(run(app([ 'openssl', 'rsautl', '-inkey', "rsamptest-$name.pem",
+                             '-encrypt', '-in', $cleartext,
+                             '-out', "rsamptest-$name.enc" ])),
+                   "rsa $name encrypt");
+                ok(run(app([ 'openssl', 'rsautl', '-inkey', "rsamptest-$name.pem",
+                             '-decrypt', '-in', "rsamptest-$name.enc",
+                             '-out', "rsamptest-$name.dec" ])),
+                   "rsa $name decrypt");
+            } else {
+                ok(run(app([ 'openssl', 'pkeyutl', '-inkey', "rsamptest-$name.pem",
+                             '-encrypt', '-in', $cleartext,
+                             '-out', "rsamptest-$name.enc" ])),
+                   "rsa $name encrypt");
+                ok(run(app([ 'openssl', 'pkeyutl', '-inkey', "rsamptest-$name.pem",
+                             '-decrypt', '-in', "rsamptest-$name.enc",
+                             '-out', "rsamptest-$name.dec" ])),
+                   "rsa $name decrypt");
+            }
         }
         ok(check_msg("rsamptest-$name.dec"), "rsa $name check result");
     }