The branch master has been updated
via ae6b654b669638882a6ddce012ff55adc7cf6a82 (commit)
from c0bfc473d80ef2e053032510149d9e5b9d81dd72 (commit)
- Log -----------------------------------------------------------------
commit ae6b654b669638882a6ddce012ff55adc7cf6a82
Author: Richard Levitte <levi...@openssl.org>
Date: Sat Apr 18 12:14:41 2020 +0200
TEST: make and use a fipsinstall script
We have copies of the exact same fipsinstall call in several test
recipes. This refactors those calls into a single simple script.
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11565)
-----------------------------------------------------------------------
Summary of changes:
test/fipsinstall.pl | 53 +++++++++++++++++++++++++++++++++++
test/recipes/30-test_evp.t | 8 +-----
test/recipes/30-test_evp_fetch_prov.t | 7 +----
test/recipes/90-test_sslprovider.t | 7 +----
4 files changed, 56 insertions(+), 19 deletions(-)
create mode 100644 test/fipsinstall.pl
diff --git a/test/fipsinstall.pl b/test/fipsinstall.pl
new file mode 100644
index 0000000000..48911452d1
--- /dev/null
+++ b/test/fipsinstall.pl
@@ -0,0 +1,53 @@
+#! /usr/bin/env perl
+
+use strict;
+use warnings;
+
+use File::Spec;
+
+use if $^O eq "VMS", "VMS::Filespec";
+
+my $bldtop_dir;
+
+# First script argument MUST be the build top directory
+BEGIN {
+ $bldtop_dir = $ARGV[0];
+ # 'use lib' needs Unix-ish paths
+ $bldtop_dir = VMS::Filespec::unixpath($bldtop_dir) if $^O eq "VMS";
+}
+
+use lib $bldtop_dir;
+use FindBin;
+use lib "$FindBin::Bin/../Configurations";
+use platform;
+
+my @providers = ($bldtop_dir, 'providers');
+my $fips_cnf = File::Spec->catfile(@providers, 'fipsinstall.cnf');
+my $fips_module = File::Spec->catfile(@providers, platform->dso('fips'));
+my $openssl = File::Spec->catfile($bldtop_dir, 'apps',
+ platform->bin('openssl'));
+
+# We create the command like this to make it readable, then massage it with
+# a space replacement regexp to make it usable with system()
+my $cmd = <<_____;
+$openssl fipsinstall \
+ -out "{fips_cnf}" \
+ -module "{fips_module}" \
+ -provider_name "fips" \
+ -mac_name "HMAC" -macopt "digest:SHA256" -macopt "hexkey:00" \
+ -section_name "fips_sect"
+_____
+$cmd =~ s|\s+| |gm;
+$cmd =~ s|{fips_cnf}|$fips_cnf|;
+$cmd =~ s|{fips_module}|$fips_module|;
+
+my $exit = 0;
+system($cmd);
+die "Failed to run '$cmd'\n" if $? == -1;
+# If there was a signal, use it as exit code with high bit set.
+$exit = (($? & 255) | 128) if ($? & 255) != 0;
+# Otherwise, just return fipsinstall's exit code
+$exit = ($? >> 8);
+
+exit($exit);
+
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 7263f29290..bf792f21b5 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -79,16 +79,10 @@ plan tests =>
+ scalar(@defltfiles);
unless ($no_fips) {
- 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.cnf'),
- '-module', $infile,
- '-provider_name', 'fips', '-mac_name', 'HMAC',
- '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
- '-section_name', 'fips_sect'])),
+ ok(run(perltest(['fipsinstall.pl', bldtop_dir()])),
"fipsinstall");
}
diff --git a/test/recipes/30-test_evp_fetch_prov.t
b/test/recipes/30-test_evp_fetch_prov.t
index 36c324eeb3..00d71fa320 100644
--- a/test/recipes/30-test_evp_fetch_prov.t
+++ b/test/recipes/30-test_evp_fetch_prov.t
@@ -47,12 +47,7 @@ my @testdata = (
unless ($no_fips) {
push @setups, {
- cmd => app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
- '-module', bldtop_file('providers',
platform->dso('fips')),
- '-provider_name', 'fips', '-mac_name', 'HMAC',
- '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
- '-section_name', 'fips_sect']),
+ cmd => perltest(['fipsinstall.pl', bldtop_dir()]),
message => "fipsinstall"
};
push @testdata, (
diff --git a/test/recipes/90-test_sslprovider.t
b/test/recipes/90-test_sslprovider.t
index f0ff38a386..814eff74cf 100644
--- a/test/recipes/90-test_sslprovider.t
+++ b/test/recipes/90-test_sslprovider.t
@@ -30,12 +30,7 @@ SKIP: {
skip "Skipping FIPS installation", 1
if disabled("fips");
- ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
- '-module', bldtop_file('providers', platform->dso('fips')),
- '-provider_name', 'fips', '-mac_name', 'HMAC',
- '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
- '-section_name', 'fips_sect'])),
+ ok(run(perltest(['fipsinstall.pl', bldtop_dir()])),
"fipsinstall");
}
