wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix fipsalgtest.pl to still work with old test vectors.

Browse source
This commit is contained in:
Dr. Stephen Henson 2011-08-18 16:06:24 +00:00
parent eea98320a0
commit c20de0386a
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fips/fipsalgtest.pl
View file

@ -12,16 +12,16 @@ my @fips_dsa_test_list = (
"DSA", "DSA",
[ "PQGGen", "fips_dssvs pqg", "path:/DSA/.*PQGGen" ], [ "PQGGen", "fips_dssvs pqg", "path:[^C]DSA/.*PQGGen" ],
[ "KeyPair", "fips_dssvs keypair", "path:/DSA/.*KeyPair" ], [ "KeyPair", "fips_dssvs keypair", "path:[^C]DSA/.*KeyPair" ],
[ "SigGen", "fips_dssvs siggen", "path:/DSA/.*SigGen" ], [ "SigGen", "fips_dssvs siggen", "path:[^C]DSA/.*SigGen" ],
[ "SigVer", "fips_dssvs sigver", "path:/DSA/.*SigVer" ] [ "SigVer", "fips_dssvs sigver", "path:[^C]DSA/.*SigVer" ]
); );
my @fips_dsa_pqgver_test_list = ( my @fips_dsa_pqgver_test_list = (
[ "PQGVer", "fips_dssvs pqgver", "path:/DSA/.*PQGVer" ] [ "PQGVer", "fips_dssvs pqgver", "path:[^C]DSA/.*PQGVer" ]
); );
@ -30,11 +30,11 @@ my @fips_dsa2_test_list = (
"DSA2", "DSA2",
[ "PQGGen", "fips_dssvs pqg", "path:/DSA2/.*PQGGen" ], [ "PQGGen", "fips_dssvs pqg", "path:[^C]DSA2/.*PQGGen" ],
[ "KeyPair", "fips_dssvs keypair", "path:/DSA2/.*KeyPair" ], [ "KeyPair", "fips_dssvs keypair", "path:[^C]DSA2/.*KeyPair" ],
[ "SigGen", "fips_dssvs siggen", "path:/DSA2/.*SigGen" ], [ "SigGen", "fips_dssvs siggen", "path:[^C]DSA2/.*SigGen" ],
[ "SigVer", "fips_dssvs sigver", "path:/DSA2/.*SigVer" ], [ "SigVer", "fips_dssvs sigver", "path:[^C]DSA2/.*SigVer" ],
[ "PQGVer", "fips_dssvs pqgver", "path:/DSA2/.*PQGVer" ] [ "PQGVer", "fips_dssvs pqgver", "path:[^C]DSA2/.*PQGVer" ]
); );
@ -616,7 +616,6 @@ if (!$fips_enabled{"v2"}) {
foreach (keys %fips_enabled) { foreach (keys %fips_enabled) {
$fips_enabled{$_} = 0 if $fips_enabled{$_} == 2; $fips_enabled{$_} = 0 if $fips_enabled{$_} == 2;
} }
$fips_enabled{"rsa-pss0"} = 1;
} }
push @fips_test_list, @fips_dsa_test_list if $fips_enabled{"dsa"}; push @fips_test_list, @fips_dsa_test_list if $fips_enabled{"dsa"};