X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Frecipes%2F30-test_evp.t;h=580ea0320de59627166adcd085df9fc1e56575f4;hp=a90b3a989b3190214c138af29331152a8b3ce963;hb=23ccf13dd68e75ba6cabbcaaeaff21d22aacb7d0;hpb=33242d9d79e7f06151e905b83dc8f995006fa7cd

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index a90b3a989b..580ea0320d 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -10,16 +10,42 @@
 use strict;
 use warnings;
 
-use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test qw(:DEFAULT data_file bldtop_dir srctop_file);
+use OpenSSL::Test::Utils;
 
 setup("test_evp");
 
-my @files = ( "evpciph.txt", "evpdigest.txt", "evpencod.txt", "evpkdf.txt",
-    "evpmac.txt", "evppbe.txt", "evppkey.txt" );
+# Default config depends on if the legacy module is built or not
+my $defaultcnf = disabled('legacy') ? 'default.cnf' : 'default-and-legacy.cnf';
 
-plan tests => scalar(@files);
+my @configs = ( $defaultcnf );
+# Only add the FIPS config if the FIPS module has been built
+push @configs, 'fips.cnf' unless disabled('fips');
 
-foreach my $f ( @files ) {
-    ok(run(test(["evp_test", srctop_file("test", "$f")])),
+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 );
+
+plan tests => (scalar(@configs) * scalar(@files)) + scalar(@defltfiles);
+
+$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
+
+foreach (@configs) {
+    $ENV{OPENSSL_CONF} = srctop_file("test", $_);
+
+    foreach my $f ( @files ) {
+        ok(run(test(["evp_test", data_file("$f")])),
+           "running evp_test $f");
+    }
+}
+
+#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", $defaultcnf);
+
+foreach my $f ( @defltfiles ) {
+    ok(run(test(["evp_test", data_file("$f")])),
        "running evp_test $f");
 }