OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
03-Jan-2008 14:39:35
Branch: OpenSSL-fips-0_9_8-stable Handle:
2008010313393400
Modified files: (Branch:
OpenSSL-fips-0_9_8-stable)
openssl/fips fipsalgtest.pl
Log:
Add v1.1.X algorithm test definitions.
Summary:
Revision Changes Path
1.1.2.8 +20 -0 openssl/fips/fipsalgtest.pl
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/fips/fipsalgtest.pl
============================================================
================
$ cvs diff -u -r1.1.2.7 -r1.1.2.8 fipsalgtest.pl
--- openssl/fips/fipsalgtest.pl 3 Jan 2008 01:23:56
-0000 1.1.2.7
+++ openssl/fips/fipsalgtest.pl 3 Jan 2008 13:39:34
-0000 1.1.2.8
-104,6 +104,17
);
+# RAND tests, DES2 version
+
+my fips_rand_des2_test_list = (
+
+ "RAND (DES2)",
+
+ [ "ANSI931_TDES2MCT", "fips_rngvs
mct" ],
+ [ "ANSI931_TDES2VST", "fips_rngvs
vst" ]
+
+);
+
# AES tests
my fips_aes_test_list = (
-309,6 +320,7
"SigGen" => "fips_dssvs
sigver",
"SigGen15" =>
"fips_rsavtest",
"SigGenRSA" => "fips_rsavtest
-x931",
+ "SigGenPSS(0)" => "fips_rsavtest
-saltlen 0",
"SigGenPSS(62)" => "fips_rsavtest
-saltlen 62",
);
-336,6 +348,7
sha => 1,
hmac => 1,
"rand-aes" => 1,
+ "rand-des2" => 0,
aes => 1,
"aes-cfb1" => 0,
des3 => 1
-410,6 +423,7
push fips_test_list, fips_sha_test_list if
$fips_enabled{"sha"};
push fips_test_list, fips_hmac_test_list if
$fips_enabled{"hmac"};
push fips_test_list, fips_rand_aes_test_list if
$fips_enabled{"rand-aes"};
+push fips_test_list, fips_rand_des2_test_list if
$fips_enabled{"rand-des2"};
push fips_test_list, fips_aes_test_list if
$fips_enabled{"aes"};
push fips_test_list, fips_aes_cfb1_test_list if
$fips_enabled{"aes-cfb1"};
push fips_test_list, fips_des3_test_list if
$fips_enabled{"des3"};
-799,6 +813,12
print STDERR "ERROR: $tname EOF on
$tstfn";
return 0;
}
+
+ # Workaround for bug in RAND des2 test output */
+ if ( $tstline =~ /^Key2 =/ && $rspline =~
/^Key1 =/ ) {
+ $rspline =~ s/^Key1/Key2/;
+ }
+
if ( $tstline ne $rspline ) {
print STDERR "ERROR: $tname
mismatch:n";
print STDERR "t $tstline !=
$rsplinen";
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
