From: Pauli <ppzgs1@gmail.com>
Date: Fri, 2 Aug 2024 01:51:11 +0000 (+1000)
Subject: test: update SSL API test in light of PKCS#1 version 1.5 padding change under FIPS
X-Git-Tag: openssl-3.4.0-alpha1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f32b22b8d779e3eea6a5ee38be5fe62ab2c35f;p=thirdparty%2Fopenssl.git

test: update SSL API test in light of PKCS#1 version 1.5 padding change under FIPS

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/25070)
---

diff --git a/test/recipes/90-test_sslapi.t b/test/recipes/90-test_sslapi.t
index ae3db3575db..932e08530a2 100644
--- a/test/recipes/90-test_sslapi.t
+++ b/test/recipes/90-test_sslapi.t
@@ -24,6 +24,10 @@ my $provconf = srctop_file("test", "fips-and-base.cnf");
 my $fipsmodcfgnew_filename = "fipsmodule_mod.cnf";
 my $fipsmodcfgnew = result_file($fipsmodcfgnew_filename);
 
+# An interum modified copy of "fipsmodule.cnf"
+my $fipsmodcfgtmp_filename = "fipsmodule_tmp.cnf";
+my $fipsmodcfgtmp = result_file($fipsmodcfgtmp_filename);
+
 # A modified copy of "fips-and-base.cnf"
 my $provconfnew = result_file("fips-and-base-temp.cnf");
 
@@ -121,7 +125,10 @@ SKIP: {
     $ENV{OPENSSL_CONF_INCLUDE} = result_dir();
     ok(replace_kv_file($fipsmodcfg,
                        'tls1-prf-ems-check', '0',
-                       $fipsmodcfgnew)
+                       $fipsmodcfgtmp)
+       && replace_kv_file($fipsmodcfgtmp,
+                          'rsa-pkcs15-padding-disabled', '0',
+                          $fipsmodcfgnew)
        && replace_line_file($provconf,
                             $fipsmodcfg_filename, $fipsmodcfgnew_filename,
                             $provconfnew)