Add des ciphers to default provider

[openssl.git] / test / recipes / 30-test_evp.t

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 2159d96df4e9d852e6be6ac174872d35ffdea54b..4e1bfb6b0be73f10ca8775832e5b16c791da4d04 100644 (file)
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -10,19 +10,54 @@
 use strict;
 use warnings;
 
-use OpenSSL::Test qw(:DEFAULT data_file bldtop_dir srctop_file);
+use OpenSSL::Test qw(:DEFAULT data_file bldtop_dir srctop_file srctop_dir bldtop_file);
+use OpenSSL::Test::Utils;
 
+BEGIN {
 setup("test_evp");
+}
+
+use lib srctop_dir('Configurations');
+use lib bldtop_dir('.');
+use platform;
+
+# Default config depends on if the legacy module is built or not
+my $defaultcnf = disabled('legacy') ? 'default.cnf' : 'default-and-legacy.cnf';
+
+my @configs = ( $defaultcnf );
+# Only add the FIPS config if the FIPS module has been built
+push @configs, 'fips.cnf' unless disabled('fips');
 
-my @configs = qw( default-and-legacy.cnf fips.cnf );
 my @files = qw( evpciph.txt evpdigest.txt );
 my @defltfiles = qw( evpencod.txt evpkdf.txt evppkey_kdf.txt evpmac.txt
     evppbe.txt evppkey.txt evppkey_ecc.txt evpcase.txt evpaessiv.txt
     evpccmcavs.txt );
+my @ideafiles = qw( evpciph_idea.txt );
+push @defltfiles, @ideafiles unless disabled("idea");
+
+my @castfiles = qw( evpciph_cast5.txt );
+push @defltfiles, @castfiles unless disabled("cast");
 
-plan tests => (scalar(@configs) * scalar(@files)) + scalar(@defltfiles);
+my @seedfiles = qw( evpciph_seed.txt );
+push @defltfiles, @seedfiles unless disabled("seed");
 
+my @sm4files = qw( evpciph_sm4.txt );
+push @defltfiles, @sm4files unless disabled("sm4");
+
+my @desfiles = qw( evpciph_des.txt );
+push @defltfiles, @desfiles unless disabled("des");
+
+plan tests => (scalar(@configs) * scalar(@files)) + scalar(@defltfiles) + 1;
+
+my $infile = bldtop_file('providers', platform->dso('fips'));
 $ENV{OPENSSL_MODULES} = bldtop_dir("providers");
+$ENV{OPENSSL_CONF_INCLUDE} = bldtop_dir("providers");
+
+ok(run(app(['openssl', 'fipsinstall', '-out', bldtop_file('providers', 'fipsinstall.conf'),
+            '-module', $infile,
+            '-provider_name', 'fips', '-mac_name', 'HMAC',
+            '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
+            '-section_name', 'fips_sect'])), "fipinstall");
 
 foreach (@configs) {
     $ENV{OPENSSL_CONF} = srctop_file("test", $_);
@@ -36,7 +71,7 @@ foreach (@configs) {
 #TODO(3.0): As more operations are converted to providers we can move more of
 #           these tests to the loop above
 
-$ENV{OPENSSL_CONF} = srctop_file("test", "default-and-legacy.cnf");
+$ENV{OPENSSL_CONF} = srctop_file("test", $defaultcnf);
 
 foreach my $f ( @defltfiles ) {
     ok(run(test(["evp_test", data_file("$f")])),