]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
test: update SSL API test in light of PKCS#1 version 1.5 padding change under FIPS
authorPauli <ppzgs1@gmail.com>
Fri, 2 Aug 2024 01:51:11 +0000 (11:51 +1000)
committerTomas Mraz <tomas@openssl.org>
Wed, 7 Aug 2024 17:35:51 +0000 (19:35 +0200)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/25070)

test/recipes/90-test_sslapi.t

index ae3db3575dbac60a4c8d4a5edb90c220b3440993..932e08530a2e8fb778cc1d5b3bc3220c19064aab 100644 (file)
@@ -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)