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:
16-Mar-2008 19:03:48
Branch: HEAD Handle:
2008031618034800
Modified files:
openssl/test runex.pl
Log:
Extend runex.pl to extract examples directly from RFC
text.
Summary:
Revision Changes Path
1.7 +308 -280 openssl/test/runex.pl
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/test/runex.pl
============================================================
================
$ cvs diff -u -r1.6 -r1.7 runex.pl
--- openssl/test/runex.pl 15 Mar 2008 23:21:33 -0000 1.6
+++ openssl/test/runex.pl 16 Mar 2008 18:03:48 -0000 1.7
-1,4 +1,4
-# test/runex.pl
+# test/cms-examples.pl
# Written by Dr Stephen N Henson (steveopenssl.org) for the OpenSSL
# project.
#
-10,7 +10,7
# are met:
#
# 1. Redistributions of source code must retain the above
copyright
-# notice, this list of conditions and the following
disclaimer.
+# notice, this list of conditions and the following
disclaimer.
#
# 2. Redistributions in binary form must reproduce the
above copyright
# notice, this list of conditions and the following
disclaimer in
-51,303 +51,331
#
============================================================
========
# Perl script to run tests against S/MIME examples in
RFC4134
-# Assumes all files are extracted in an directory called
"examples"
+# Assumes RFC is in current directory and called
"rfc4134.txt"
+
+use MIME::Base64;
my $badttest = 0;
-my $verbose = 1;
+my $verbose = 1;
my $cmscmd = "../util/shlib_wrap.sh ../apps/openssl
cms";
-my $convcmd = "../util/shlib_wrap.sh ../apps/openssl
x509 -inform DER";
-my $pconvcmd = "../util/shlib_wrap.sh
../apps/openssl rsa -inform DER";
-my $exdir = "examples";
+my $exdir = "./";
+my $exfile = "./rfc4134.txt";
my test_list = (
-["3.1.bin" => "dataout"],
-["3.2.bin" => "encode, dataout"],
-["4.1.bin" => "encode, verifyder,
content, dss"],
-["4.2.bin" => "encode, verifyder, cont,
rsa"],
-["4.3.bin" => "encode, verifyder,
cont_extern, dss"],
-["4.4.bin" => "encode, verifyder, cont,
dss"],
-["4.5.bin" => "verifyder, content,
rsa"],
-["4.6.bin" => "encode, verifyder, cont,
dss"],
-["4.7.bin" => "encode, verifyder, cont,
dss"],
-["4.8.eml" => "verifymime, dss"],
-["4.9.eml" => "verifymime, dss"],
-["4.10.bin" => "encode, verifyder,
cont, dss"],
-["4.11.bin" => "encode"],
-["5.1.bin" => "encode, envelopeder,
cont"],
-["5.2.bin" => "encode, envelopeder,
cont"],
-["5.3.eml" => "envelopemime,
cont"],
-["6.0.bin" => "encode, digest,
cont"],
-["7.1.bin" => "encode, encrypted,
cont"],
-["7.2.bin" => "encode, encrypted,
cont"]
+ [ "3.1.bin" => "dataout" ],
+ [ "3.2.bin" => "encode,
dataout" ],
+ [ "4.1.bin" => "encode, verifyder,
content, dss" ],
+ [ "4.2.bin" => "encode, verifyder,
cont, rsa" ],
+ [ "4.3.bin" => "encode, verifyder,
cont_extern, dss" ],
+ [ "4.4.bin" => "encode, verifyder,
cont, dss" ],
+ [ "4.5.bin" => "verifyder,
content, rsa" ],
+ [ "4.6.bin" => "encode, verifyder,
cont, dss" ],
+ [ "4.7.bin" => "encode, verifyder,
cont, dss" ],
+ [ "4.8.eml" => "verifymime,
dss" ],
+ [ "4.9.eml" => "verifymime,
dss" ],
+ [ "4.10.bin" => "encode, verifyder,
cont, dss" ],
+ [ "4.11.bin" => "encode" ],
+ [ "5.1.bin" => "encode,
envelopeder, cont" ],
+ [ "5.2.bin" => "encode,
envelopeder, cont" ],
+ [ "5.3.eml" => "envelopemime,
cont" ],
+ [ "6.0.bin" => "encode, digest,
cont" ],
+ [ "7.1.bin" => "encode, encrypted,
cont" ],
+ [ "7.2.bin" => "encode, encrypted,
cont" ]
);
-my $secretkey =
"73:7c:79:1f:25:ea:d0:e0:46:29:25:43:52:f7:dc:62:91:e5:
cb:26:91:7a:da:32";
+# Extract examples from RFC4134 text.
+# Base64 decode all examples, certificates and
+# private keys are converted to PEM format.
+
+my ( $filename, $data );
+
+my cleanup = ( "cms.out", "cms.err",
"tmp.der", "tmp.txt" );
+
+$data = "";
+
+open( IN, $exfile ) || die "Can't Open RFC examples
file $exfile";
+
+while (<IN>) {
+ next unless (/^|/);
+ s/^|//;
+ next if (/^*/);
+ if (/^>(.*)$/) {
+ $filename = $1;
+ next;
+ }
+ if (/^</) {
+ $filename = "$exdir/$filename";
+ if ( $filename =~ /.bin$/ || $filename =~
/.eml$/ ) {
+ $data = decode_base64($data);
+ open OUT, ">$filename";
+ binmode OUT;
+ print OUT $data;
+ close OUT;
+ push cleanup, $filename;
+ }
+ elsif ( $filename =~ /.cer$/ ) {
+ write_pem( $filename,
"CERTIFICATE", $data );
+ }
+ elsif ( $filename =~ /.pri$/ ) {
+ write_pem( $filename, "PRIVATE
KEY", $data );
+ }
+ $data = "";
+ $filename = "";
+ }
+ else {
+ $data .= $_;
+ }
+
+}
- if (!-d $exdir)
- {
- print STDERR "FATAL ERROR: examples directory
missing!!n";
- exit 1;
- }
-
- system ("$convcmd -in $exdir/CarlDSSSelf.cer -out
$exdir/CarlDSSSelf.pem");
- system ("$convcmd -in $exdir/CarlRSASelf.cer -out
$exdir/CarlRSASelf.pem");
- system ("$convcmd -in $exdir/BobRSASignByCarl.cer
-out $exdir/BobRSASignByCarl.pem");
- system ("$pconvcmd -in $exdir/BobPrivRSAEncrypt.pri
-out $exdir/BobPrivRSAEncrypt.pem");
+my $secretkey =
+
"73:7c:79:1f:25:ea:d0:e0:46:29:25:43:52:f7:dc:62:91:e5:
cb:26:91:7a:da:32";
+
+if ( !-d $exdir ) {
+ print STDERR "FATAL ERROR: examples directory
missing!!n";
+ exit 1;
+}
foreach (test_list) {
- my ($file, $tlist) = $_;
- print "Example file $file:n";
- if ($tlist =~ /encode/)
- {
- run_reencode_test($exdir, $file);
- }
- if ($tlist =~ /dataout/)
- {
- run_dataout_test($exdir, $file);
- }
- if ($tlist =~ /verify/)
- {
- run_verify_test($exdir, $tlist, $file);
- }
- if ($tlist =~ /digest/)
- {
- run_digest_test($exdir, $tlist, $file);
- }
- if ($tlist =~ /encrypted/)
- {
- run_encrypted_test($exdir, $tlist, $file, $secretkey);
- }
- if ($tlist =~ /envelope/)
- {
- run_envelope_test($exdir, $tlist, $file);
- }
+ my ( $file, $tlist ) = $_;
+ print "Example file $file:n";
+ if ( $tlist =~ /encode/ ) {
+ run_reencode_test( $exdir, $file );
+ }
+ if ( $tlist =~ /dataout/ ) {
+ run_dataout_test( $exdir, $file );
+ }
+ if ( $tlist =~ /verify/ ) {
+ run_verify_test( $exdir, $tlist, $file );
+ }
+ if ( $tlist =~ /digest/ ) {
+ run_digest_test( $exdir, $tlist, $file );
+ }
+ if ( $tlist =~ /encrypted/ ) {
+ run_encrypted_test( $exdir, $tlist, $file,
$secretkey );
+ }
+ if ( $tlist =~ /envelope/ ) {
+ run_envelope_test( $exdir, $tlist, $file );
+ }
}
-unlink "cms.out";
-unlink "cms.err";
-unlink "tmp.der";
-unlink "tmp.txt";
+foreach (cleanup) {
+ unlink $_;
+}
if ($badtest) {
- print "n$badtest TESTS FAILED!!n";
-} else {
- print "n***All tests successful***n";
-}
-
-
-sub run_reencode_test
- {
- my ($cmsdir, $tfile) = _;
- unlink "tmp.der";
-
- system ("$cmscmd -cmsout -inform DER -outform
DER" .
- " -in $cmsdir/$tfile -out tmp.der");
-
- if ($?)
- {
- print "tReencode command FAILED!!n";
- $badtest++;
- }
- elsif (!cmp_files("$cmsdir/$tfile",
"tmp.der"))
- {
- print "tReencode FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tReencode passedn" if $verbose;
- }
- }
-
-sub run_dataout_test
- {
- my ($cmsdir, $tfile) = _;
- unlink "tmp.txt";
-
- system ("$cmscmd -data_out -inform DER" .
- " -in $cmsdir/$tfile -out tmp.txt");
-
- if ($?)
- {
- print "tDataout command FAILED!!n";
- $badtest++;
- }
- elsif (!cmp_files("$cmsdir/ExContent.bin",
"tmp.txt"))
- {
- print "tDataout compare FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tDataout passedn" if $verbose;
- }
- }
-
-sub run_verify_test
- {
- my ($cmsdir, $tlist, $tfile) = _;
- unlink "tmp.txt";
-
- $form = "DER" if $tlist =~ /verifyder/;
- $form = "SMIME" if $tlist =~ /verifymime/;
- $cafile = "$cmsdir/CarlDSSSelf.pem" if $tlist
=~ /dss/;
- $cafile = "$cmsdir/CarlRSASelf.pem" if $tlist
=~ /rsa/;
-
- $cmd = "$cmscmd -verify -inform $form" .
- " -CAfile $cafile" .
- " -in $cmsdir/$tfile -out tmp.txt";
-
- $cmd .= " -content $cmsdir/ExContent.bin" if
$tlist =~ /cont_extern/;
-
- system ("$cmd 2>cms.err 1>cms.out");
-
- if ($?)
- {
- print "tVerify command FAILED!!n";
- $badtest++;
- }
- elsif ($tlist =~ /cont/ &&
- !cmp_files("$cmsdir/ExContent.bin",
"tmp.txt"))
- {
- print "tVerify content compare FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tVerify passedn" if $verbose;
- }
- }
-
-sub run_envelope_test
- {
- my ($cmsdir, $tlist, $tfile) = _;
- unlink "tmp.txt";
-
- $form = "DER" if $tlist =~ /envelopeder/;
- $form = "SMIME" if $tlist =~ /envelopemime/;
-
- $cmd = "$cmscmd -decrypt -inform $form" .
- " -recip $cmsdir/BobRSASignByCarl.pem" .
- " -inkey $cmsdir/BobPrivRSAEncrypt.pem" .
- " -in $cmsdir/$tfile -out tmp.txt";
-
- system ("$cmd 2>cms.err 1>cms.out");
-
- if ($?)
- {
- print "tDecrypt command FAILED!!n";
- $badtest++;
- }
- elsif ($tlist =~ /cont/ &&
- !cmp_files("$cmsdir/ExContent.bin",
"tmp.txt"))
- {
- print "tDecrypt content compare
FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tDecrypt passedn" if $verbose;
- }
- }
-
-sub run_digest_test
- {
- my ($cmsdir, $tlist, $tfile) = _;
- unlink "tmp.txt";
-
- my $cmd = "$cmscmd -digest_verify -inform DER"
.
- " -in $cmsdir/$tfile -out tmp.txt";
-
- system ("$cmd 2>cms.err 1>cms.out");
-
- if ($?)
- {
- print "tDigest verify command FAILED!!n";
- $badtest++;
- }
- elsif ($tlist =~ /cont/ &&
- !cmp_files("$cmsdir/ExContent.bin",
"tmp.txt"))
- {
- print "tDigest verify content compare
FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tDigest verify passedn" if
$verbose;
- }
- }
-
-sub run_encrypted_test
- {
- my ($cmsdir, $tlist, $tfile, $key) = _;
- unlink "tmp.txt";
-
- system ("$cmscmd -EncryptedData_decrypt -inform
DER" .
- " -secretkey $key" .
- " -in $cmsdir/$tfile -out tmp.txt");
-
- if ($?)
- {
- print "tEncrypted Data command FAILED!!n";
- $badtest++;
- }
- elsif ($tlist =~ /cont/ &&
- !cmp_files("$cmsdir/ExContent.bin",
"tmp.txt"))
- {
- print "tEncrypted Data content compare
FAILED!!n";
- $badtest++;
- }
- else
- {
- print "tEncryptedData verify passedn" if
$verbose;
- }
- }
-
-sub cmp_files
- {
- my ($f1, $f2) = _;
- my ($fp1, $fp2);
-
- my ($rd1, $rd2);
-
- if (!open($fp1, "<$f1") ) {
- print STDERR "Can't Open file $f1n";
- return 0;
- }
-
- if (!open($fp2, "<$f2") ) {
- print STDERR "Can't Open file $f2n";
- return 0;
- }
-
- binmode $fp1;
- binmode $fp2;
-
- my $ret = 0;
-
- for (;;)
- {
- $n1 = sysread $fp1, $rd1, 4096;
- $n2 = sysread $fp2, $rd2, 4096;
- last if ($n1 != $n2);
- last if ($rd1 ne $rd2);
-
- if ($n1 == 0)
- {
- $ret = 1;
- last;
- }
+ print "n$badtest TESTS FAILED!!n";
+}
+else {
+ print "n***All tests successful***n";
+}
+
+sub write_pem {
+ my ( $filename, $str, $data ) = _;
- }
+ $filename =~ s/.[^.]*$/.pem/;
- close $fp1;
- close $fp2;
+ push cleanup, $filename;
- return $ret;
+ open OUT, ">$filename";
- }
+ print OUT "-----BEGIN $str-----n";
+ print OUT $data;
+ print OUT "-----END $str-----n";
+ close OUT;
+}
+
+sub run_reencode_test {
+ my ( $cmsdir, $tfile ) = _;
+ unlink "tmp.der";
+
+ system( "$cmscmd -cmsout -inform DER -outform
DER"
+ . " -in $cmsdir/$tfile -out tmp.der"
);
+
+ if ($?) {
+ print "tReencode command FAILED!!n";
+ $badtest++;
+ }
+ elsif ( !cmp_files( "$cmsdir/$tfile",
"tmp.der" ) ) {
+ print "tReencode FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tReencode passedn" if
$verbose;
+ }
+}
+
+sub run_dataout_test {
+ my ( $cmsdir, $tfile ) = _;
+ unlink "tmp.txt";
+
+ system(
+ "$cmscmd -data_out -inform DER" .
" -in $cmsdir/$tfile -out tmp.txt" );
+
+ if ($?) {
+ print "tDataout command FAILED!!n";
+ $badtest++;
+ }
+ elsif ( !cmp_files(
"$cmsdir/ExContent.bin", "tmp.txt" ) )
{
+ print "tDataout compare FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tDataout passedn" if
$verbose;
+ }
+}
+
+sub run_verify_test {
+ my ( $cmsdir, $tlist, $tfile ) = _;
+ unlink "tmp.txt";
+
+ $form = "DER" if
$tlist =~ /verifyder/;
+ $form = "SMIME" if
$tlist =~ /verifymime/;
+ $cafile = "$cmsdir/CarlDSSSelf.pem" if
$tlist =~ /dss/;
+ $cafile = "$cmsdir/CarlRSASelf.pem" if
$tlist =~ /rsa/;
+
+ $cmd =
+ "$cmscmd -verify -inform $form"
+ . " -CAfile $cafile"
+ . " -in $cmsdir/$tfile -out tmp.txt";
+
+ $cmd .= " -content $cmsdir/ExContent.bin"
if $tlist =~ /cont_extern/;
+
+ system("$cmd 2>cms.err 1>cms.out");
+
+ if ($?) {
+ print "tVerify command FAILED!!n";
+ $badtest++;
+ }
+ elsif ( $tlist =~ /cont/
+ && !cmp_files(
"$cmsdir/ExContent.bin", "tmp.txt" ) )
+ {
+ print "tVerify content compare
FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tVerify passedn" if $verbose;
+ }
+}
+
+sub run_envelope_test {
+ my ( $cmsdir, $tlist, $tfile ) = _;
+ unlink "tmp.txt";
+
+ $form = "DER" if $tlist =~
/envelopeder/;
+ $form = "SMIME" if $tlist =~
/envelopemime/;
+
+ $cmd =
+ "$cmscmd -decrypt -inform $form"
+ . " -recip $cmsdir/BobRSASignByCarl.pem"
+ . " -inkey
$cmsdir/BobPrivRSAEncrypt.pem"
+ . " -in $cmsdir/$tfile -out tmp.txt";
+
+ system("$cmd 2>cms.err 1>cms.out");
+
+ if ($?) {
+ print "tDecrypt command FAILED!!n";
+ $badtest++;
+ }
+ elsif ( $tlist =~ /cont/
+ && !cmp_files(
"$cmsdir/ExContent.bin", "tmp.txt" ) )
+ {
+ print "tDecrypt content compare
FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tDecrypt passedn" if
$verbose;
+ }
+}
+
+sub run_digest_test {
+ my ( $cmsdir, $tlist, $tfile ) = _;
+ unlink "tmp.txt";
+
+ my $cmd =
+ "$cmscmd -digest_verify -inform DER" .
" -in $cmsdir/$tfile -out tmp.txt";
+
+ system("$cmd 2>cms.err 1>cms.out");
+
+ if ($?) {
+ print "tDigest verify command
FAILED!!n";
+ $badtest++;
+ }
+ elsif ( $tlist =~ /cont/
+ && !cmp_files(
"$cmsdir/ExContent.bin", "tmp.txt" ) )
+ {
+ print "tDigest verify content compare
FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tDigest verify passedn" if
$verbose;
+ }
+}
+
+sub run_encrypted_test {
+ my ( $cmsdir, $tlist, $tfile, $key ) = _;
+ unlink "tmp.txt";
+
+ system( "$cmscmd -EncryptedData_decrypt -inform
DER"
+ . " -secretkey $key"
+ . " -in $cmsdir/$tfile -out tmp.txt"
);
+
+ if ($?) {
+ print "tEncrypted Data command
FAILED!!n";
+ $badtest++;
+ }
+ elsif ( $tlist =~ /cont/
+ && !cmp_files(
"$cmsdir/ExContent.bin", "tmp.txt" ) )
+ {
+ print "tEncrypted Data content compare
FAILED!!n";
+ $badtest++;
+ }
+ else {
+ print "tEncryptedData verify passedn"
if $verbose;
+ }
+}
+
+sub cmp_files {
+ my ( $f1, $f2 ) = _;
+ my ( $fp1, $fp2 );
+
+ my ( $rd1, $rd2 );
+
+ if ( !open( $fp1, "<$f1" ) ) {
+ print STDERR "Can't Open file $f1n";
+ return 0;
+ }
+
+ if ( !open( $fp2, "<$f2" ) ) {
+ print STDERR "Can't Open file $f2n";
+ return 0;
+ }
+
+ binmode $fp1;
+ binmode $fp2;
+
+ my $ret = 0;
+
+ for ( ; ; ) {
+ $n1 = sysread $fp1, $rd1, 4096;
+ $n2 = sysread $fp2, $rd2, 4096;
+ last if ( $n1 != $n2 );
+ last if ( $rd1 ne $rd2 );
+
+ if ( $n1 == 0 ) {
+ $ret = 1;
+ last;
+ }
+
+ }
+
+ close $fp1;
+ close $fp2;
+
+ return $ret;
+
+}
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
