From: Richard Levitte <levitte@openssl.org>
Date: Wed, 17 Jul 2019 12:26:26 +0000 (+0200)
Subject: test/recipes/30-test_evp.t: Modify to test with different providers
X-Git-Tag: openssl-3.0.0-alpha1~1714
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e2f72313ccd168eb571b8a4c7cfaf0bf46bdcf9f;p=oweals%2Fopenssl.git

test/recipes/30-test_evp.t: Modify to test with different providers

Different providers will give different results, and we need to test
them all.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9398)
---

diff --git a/test/default-and-legacy.cnf b/test/default-and-legacy.cnf
new file mode 100644
index 0000000000..adfa225f64
--- /dev/null
+++ b/test/default-and-legacy.cnf
@@ -0,0 +1,14 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+default = default_sect
+legacy = legacy_sect
+
+[default_sect]
+activate = 1
+
+[legacy_sect]
+activate = 1
diff --git a/test/default.cnf b/test/default.cnf
new file mode 100644
index 0000000000..12da8cb5bd
--- /dev/null
+++ b/test/default.cnf
@@ -0,0 +1,10 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+default = default_sect
+
+[default_sect]
+activate = 1
diff --git a/test/fips.cnf b/test/fips.cnf
new file mode 100644
index 0000000000..0578c8481f
--- /dev/null
+++ b/test/fips.cnf
@@ -0,0 +1,10 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+fips = fips_sect
+
+[fips_sect]
+activate = 1
diff --git a/test/legacy.cnf b/test/legacy.cnf
new file mode 100644
index 0000000000..60b09a1e34
--- /dev/null
+++ b/test/legacy.cnf
@@ -0,0 +1,10 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+legacy = legacy_sect
+
+[legacy_sect]
+activate = 1
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index c140f1a87e..ed21a5f1fe 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -10,19 +10,24 @@
 use strict;
 use warnings;
 
-use OpenSSL::Test qw(:DEFAULT data_file bldtop_dir);
+use OpenSSL::Test qw(:DEFAULT data_file bldtop_dir srctop_file);
 
 setup("test_evp");
 
-my @files = ( "evpciph.txt", "evpdigest.txt", "evpencod.txt", "evpkdf.txt",
-    "evppkey_kdf.txt", "evpmac.txt", "evppbe.txt", "evppkey.txt",
-    "evppkey_ecc.txt", "evpcase.txt", "evpaessiv.txt", "evpccmcavs.txt" );
+my @configs = qw( default-and-legacy.cnf fips.cnf );
+my @files = qw( evpciph.txt evpdigest.txt evpencod.txt evpkdf.txt
+    evppkey_kdf.txt evpmac.txt evppbe.txt evppkey.txt
+    evppkey_ecc.txt evpcase.txt evpaessiv.txt evpccmcavs.txt );
 
-plan tests => scalar(@files);
+plan tests => scalar(@configs) * scalar(@files);
 
 $ENV{OPENSSL_MODULES} = bldtop_dir("providers");
 
-foreach my $f ( @files ) {
-    ok(run(test(["evp_test", data_file("$f")])),
-       "running evp_test $f");
+foreach (@configs) {
+    $ENV{OPENSSL_CONF} = srctop_file("test", $_);
+
+    foreach my $f ( @files ) {
+        ok(run(test(["evp_test", data_file("$f")])),
+           "running evp_test $f");
+    }
 }