diff options
| author | Pauli <pauli@openssl.org> | 2023-04-18 11:11:17 +1000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-04-21 17:04:13 +0100 |
| commit | b236fd27caa54cbd1d04204a1fbdb6689c51dbc0 (patch) | |
| tree | 0c12f55c24f798645b59722cb39ab6144922ad15 | |
| parent | 3375ae41847c133d1ce731bc8fd367d12b0049fd (diff) | |
| download | openssl-new-b236fd27caa54cbd1d04204a1fbdb6689c51dbc0.tar.gz | |
fips: setup the FIPS provider in pendantic mode for testing
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20762)
(cherry picked from commit c04e78f0c69201226430fed14c291c281da47f2d)
| -rw-r--r-- | test/recipes/00-prep_fipsmodule_cnf.t | 2 | ||||
| -rw-r--r-- | util/mk-fipsmodule-cnf.pl | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/test/recipes/00-prep_fipsmodule_cnf.t b/test/recipes/00-prep_fipsmodule_cnf.t index 8d53e8a40f..bf1b0c8081 100644 --- a/test/recipes/00-prep_fipsmodule_cnf.t +++ b/test/recipes/00-prep_fipsmodule_cnf.t @@ -30,7 +30,7 @@ my $fipsmoduleconf = bldtop_file('test', 'fipsmodule.cnf'); plan tests => 1; # Create the $fipsmoduleconf file -ok(run(app(['openssl', 'fipsinstall', +ok(run(app(['openssl', 'fipsinstall', '-pedantic', '-module', $fipsmodule, '-provider_name', 'fips', '-section_name', 'fips_sect', '-out', $fipsmoduleconf])), "fips install"); diff --git a/util/mk-fipsmodule-cnf.pl b/util/mk-fipsmodule-cnf.pl index 6a86e06b8b..b4ab729914 100644 --- a/util/mk-fipsmodule-cnf.pl +++ b/util/mk-fipsmodule-cnf.pl @@ -8,9 +8,14 @@ use Getopt::Long; -my $activate = 1; +# Module options for pedantic FIPS mode +# self_test_onload happens if install_mac isn't included, don't add it below my $conditional_errors = 1; my $security_checks = 1; +my $ems_check = 0; +my $drgb_no_trunc_dgst = 0; + +my $activate = 1; my $mac_key; my $module_name; my $section_name = "fips_sect"; @@ -40,5 +45,7 @@ print <<_____; activate = $activate conditional-errors = $conditional_errors security-checks = $security_checks +ems_check = $ems_check +drgb_no_trunc_dgst = $drgb_no_trunc_dgst module-mac = $module_mac _____ |