This commit was generated by cvs2git to track changes on a CVS vendor

branch.

4 files changed, 299 insertions, 29 deletions

diff --git a/src/lib/libssl/test/bctest.com b/src/lib/libssl/test/bctest.com
new file mode 100644
index 0000000000..d7e5ec139e
--- /dev/null
+++ b/src/lib/libssl/test/bctest.com
@@ -0,0 +1,152 @@
+$!
+$! Check operation of "bc".
+$!
+$! 2010-04-05 SMS.  New.  Based (loosely) on "bctest".
+$!
+$!
+$ tmp_file_name = "tmp.bctest"
+$ failure = ""
+$!
+$! Basic command test.
+$!
+$ on warning then goto bc_fail
+$ bc
+$ on error then exit
+$!
+$! Test for SunOS 5.[78] bc bug.
+$!
+$ if (failure .eqs. "")
+$ then
+$!
+$     define /user_mode sys$output 'tmp_file_name'
+$     bc
+obase=16
+ibase=16
+a=AD88C418F31B3FC712D0425001D522B3AE9134FF3A98C13C1FCC1682211195406C1A6C66C6A\
+CEEC1A0EC16950233F77F1C2F2363D56DD71A36C57E0B2511FC4BA8F22D261FE2E9356D99AF57\
+10F3817C0E05BF79C423C3F66FDF321BE8D3F18F625D91B670931C1EF25F28E489BDA1C5422D1\
+C3F6F7A1AD21585746ECC4F10A14A778AF56F08898E965E9909E965E0CB6F85B514150C644759\
+3BE731877B16EA07B552088FF2EA728AC5E0FF3A23EB939304519AB8B60F2C33D6BA0945B66F0\
+4FC3CADF855448B24A9D7640BCF473E
+b=DCE91E7D120B983EA9A104B5A96D634DD644C37657B1C7860B45E6838999B3DCE5A555583C6\
+9209E41F413422954175A06E67FFEF6746DD652F0F48AEFECC3D8CAC13523BDAAD3F5AF4212BD\
+8B3CD64126E1A82E190228020C05B91C8B141F1110086FC2A4C6ED631EBA129D04BB9A19FC53D\
+3ED0E2017D60A68775B75481449
+(a/b)*b + (a%b) - a
+$     status = $status
+$     output_expected = "0"
+$     gosub check_output
+$     if (output .ne. 1)
+$     then
+$         failure = "SunOStest"
+$     else
+$         delete 'f$parse( tmp_file_name)'
+$     endif
+$ endif
+$!
+$! Test for SCO bc bug.
+$!
+$ if (failure .eqs. "")
+$ then
+$!
+$     define /user_mode sys$output 'tmp_file_name'
+$     bc
+obase=16
+ibase=16
+-FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4AEC6F15AC177F176F2274D2\
+9DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7F5ADFACEE54573F5D256A06\
+11B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99FB9812A0E4A5773D8B254117\
+1239157EC6E3D8D50199 * -FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4\
+AEC6F15AC177F176F2274D29DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7\
+F5ADFACEE54573F5D256A0611B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99F\
+B9812A0E4A5773D8B2541171239157EC6E3D8D50199 - FFBACC221682DA464B6D7F123482522\
+02EDAEDCA38C3B69E9B7BBCD6165A9CD8716C4903417F23C09A85B851961F92C217258CEEB866\
+85EFCC5DD131853A02C07A873B8E2AF2E40C6D5ED598CD0E8F35AD49F3C3A17FDB7653E4E2DC4\
+A8D23CC34686EE4AD01F7407A7CD74429AC6D36DBF0CB6A3E302D0E5BDFCD048A3B90C1BE5AA8\
+E16C3D5884F9136B43FF7BB443764153D4AEC176C681B078F4CC53D6EB6AB76285537DDEE7C18\
+8C72441B52EDBDDBC77E02D34E513F2AABF92F44109CAFE8242BD0ECBAC5604A94B02EA44D43C\
+04E9476E6FBC48043916BFA1485C6093603600273C9C33F13114D78064AE42F3DC466C7DA543D\
+89C8D71
+AD534AFBED2FA39EE9F40E20FCF9E2C861024DB98DDCBA1CD118C49CA55EEBC20D6BA51B2271C\
+928B693D6A73F67FEB1B4571448588B46194617D25D910C6A9A130CC963155CF34079CB218A44\
+8A1F57E276D92A33386DDCA3D241DB78C8974ABD71DD05B0FA555709C9910D745185E6FE108E3\
+37F1907D0C56F8BFBF52B9704 % -E557905B56B13441574CAFCE2BD257A750B1A8B2C88D0E36\
+E18EF7C38DAC80D3948E17ED63AFF3B3467866E3B89D09A81B3D16B52F6A3C7134D3C6F5123E9\
+F617E3145BBFBE9AFD0D6E437EA4FF6F04BC67C4F1458B4F0F47B64 - 1C2BBBB19B74E86FD32\
+9E8DB6A8C3B1B9986D57ED5419C2E855F7D5469E35E76334BB42F4C43E3F3A31B9697C171DAC4\
+D97935A7E1A14AD209D6CF811F55C6DB83AA9E6DFECFCD6669DED7171EE22A40C6181615CAF3F\
+5296964
+$     status = $status
+$     output_expected = "0\0"
+$     gosub check_output
+$     if (output .ne. 1)
+$     then
+$         failure = "SCOtest"
+$     else
+$         delete 'f$parse( tmp_file_name)'
+$     endif
+$ endif
+$!
+$! Test for working 'print' command.
+$!
+$ if (failure .eqs. "")
+$ then
+$!
+$     define /user_mode sys$output 'tmp_file_name'
+$     bc
+print "OK"
+$     status = $status
+$     output_expected = "OK"
+$     gosub check_output
+$     if (output .ne. 1)
+$     then
+$         failure = "printtest"
+$     else
+$         delete 'f$parse( tmp_file_name)'
+$     endif
+$ endif
+$!
+$ if (failure .nes. "")
+$ then
+$     write sys$output -
+       "No working bc found.  Consider installing GNU bc."
+$     exit %X00030000 ! %DCL-W-NORMAL
+$ endif
+$!
+$ exit
+$!
+$!
+$! Complete "bc" command failure.
+$!
+$ bc_fail:
+$ write sys$output -
+   "No ""bc"" program/symbol found.  Consider installing GNU bc."
+$ exit %X00030000 ! %DCL-W-NORMAL
+$!
+$!
+$! Output check subroutine.
+$!
+$ check_output:
+$     eof = 0
+$     line_nr = 0
+$     open /read tmp_file 'tmp_file_name'
+$     c_o_loop:
+$         read /error = error_read tmp_file line
+$         goto ok_read
+$         error_read:
+$         eof = 1
+$         ok_read:
+$         line_expected = f$element( line_nr, "\", output_expected)
+$         line_nr = line_nr+ 1
+$     if ((line_expected .nes. "\") .and. (.not. eof) .and. -
+       (line_expected .eqs. line)) then goto c_o_loop
+$!
+$     if ((line_expected .eqs. "\") .and. eof)
+$     then
+$         output = 1
+$     else
+$         output = 0
+$     endif
+$     close tmp_file
+$ return
+$!
diff --git a/src/lib/libssl/test/bntest.com b/src/lib/libssl/test/bntest.com
new file mode 100644
index 0000000000..6545d2e5a5
--- /dev/null
+++ b/src/lib/libssl/test/bntest.com
@@ -0,0 +1,76 @@
+$!
+$! Analyze bntest output file.
+$!
+$! Exit status = 1 (success) if all tests passed,
+$!               0 (warning) if any test failed.
+$!
+$! 2011-02-20 SMS.  Added code to skip "#" comments in the input file.
+$!
+$! 2010-04-05 SMS.  New.  Based (loosely) on perl code in bntest-vms.sh.
+$!
+$!                  Expect data like:
+$!                        test test_name1
+$!                        0
+$!                        [...]
+$!                        test test_name2
+$!                        0
+$!                        [...]
+$!                        [...]
+$!
+$!                  Some tests have no following "0" lines.
+$!
+$ result_file_name = f$edit( p1, "TRIM")
+$ if (result_file_name .eqs. "")
+$ then
+$     result_file_name = "bntest-vms.out"
+$ endif
+$!
+$ fail = 0
+$ passed = 0
+$ tests = 0
+$!
+$ on control_c then goto tidy
+$ on error then goto tidy
+$!
+$ open /read result_file 'result_file_name'
+$!
+$ read_loop:
+$     read /end = read_loop_end /error = tidy result_file line
+$     t1 = f$element( 0, " ", line)
+$!
+$!    Skip "#" comment lines.
+$     if (f$extract( 0, 1, f$edit( line, "TRIM")) .eqs. "#") then -
+       goto read_loop
+$!
+$     if (t1 .eqs. "test")
+$     then
+$         passed = passed+ 1
+$         tests = tests+ 1
+$         fail = 1
+$         t2 = f$extract( 5, 1000, line)
+$         write sys$output "verify ''t2'"
+$     else
+$         if (t1 .nes. "0")
+$         then
+$             write sys$output "Failed! bc: ''line'"
+$             passed = passed- fail
+$             fail = 0
+$         endif
+$     endif
+$ goto read_loop
+$ read_loop_end:
+$ write sys$output "''passed'/''tests' tests passed"
+$!
+$ tidy:
+$ if f$trnlnm( "result_file", "LNM$PROCESS_TABLE", , "SUPERVISOR", , "CONFINE")
+$ then
+$     close result_file
+$ endif
+$!
+$ if ((tests .gt. 0) .and. (tests .eq. passed))
+$ then
+$    exit 1
+$ else
+$    exit 0
+$ endif
+$!
diff --git a/src/lib/libssl/test/clean_test.com b/src/lib/libssl/test/clean_test.com
new file mode 100755
index 0000000000..7df633fbef
--- /dev/null
+++ b/src/lib/libssl/test/clean_test.com
@@ -0,0 +1,35 @@
+$!
+$! Delete various test results files.
+$!
+$ def_orig = f$environment( "default")
+$ proc = f$environment( "procedure")
+$ proc_dev_dir = f$parse( "A.;", proc) - "A.;"
+$!
+$ on control_c then goto tidy
+$ on error then goto tidy
+$!
+$ set default 'proc_dev_dir'
+$!
+$ files := *.cms;*, *.srl;*, *.ss;*, -
+   cms.err;*, cms.out;*, newreq.pem;*, -
+   p.txt-zlib-cipher;*, -
+   smtst.txt;*, testkey.pem;*, testreq.pem;*, -
+   test_*.err;*, test_*.out;*, -
+   .rnd;*
+$!
+$ delim = ","
+$ i = 0
+$ loop:
+$    file = f$edit( f$element( i, delim, files), "trim")
+$    if (file .eqs. delim) then goto loop_end
+$    if (f$search( file) .nes. "") then -
+      delete 'p1' 'file'
+$    i = i+ 1
+$ goto loop
+$ loop_end:
+$!
+$ tidy:
+$ 
+$ if (f$type( def_orig) .nes. "") then -
+   set default 'def_orig'
+$!
diff --git a/src/lib/libssl/test/testtsa.com b/src/lib/libssl/test/testtsa.com
index e3c586f14a..29fb1d0e63 100644
--- a/src/lib/libssl/test/testtsa.com
+++ b/src/lib/libssl/test/testtsa.com
@@ -2,14 +2,17 @@ $!
 $! A few very basic tests for the 'ts' time stamping authority command.
 $!
 $
-$       __arch := VAX
+$       __arch = "VAX"
 $       if f$getsyi("cpu") .ge. 128 then -
            __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$       if __arch .eqs. "" then __arch := UNK
-$       exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$       if __arch .eqs. "" then __arch = "UNK"
+$!
+$       if (p4 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       openssl := mcr 'f$parse(exe_dir+"openssl.exe")'
-$       OPENSSL_CONF := [-]CAtsa.cnf
+$       openssl = "mcr ''f$parse(exe_dir+"openssl.exe")'"
+$       OPENSSL_CONF = "[-]CAtsa.cnf"
 $       ! Because that's what ../apps/CA.sh really looks at
 $       SSLEAY_CONFIG = "-config " + OPENSSL_CONF
 $
@@ -114,8 +117,8 @@ $
 $ time_stamp_response_token_test:
 $       subroutine
 $
-$               RESPONSE2:='p2'.copy_tsr
-$               TOKEN_DER:='p2'.token_der
+$               RESPONSE2 = p2+ "-copy_tsr"
+$               TOKEN_DER = p2+ "-token_der"
 $               openssl ts -reply -in 'p2' -out 'TOKEN_DER' -token_out
 $               if $severity .ne. 1 then call error
 $               openssl ts -reply -in 'TOKEN_DER' -token_in -out 'RESPONSE2'
@@ -145,13 +148,13 @@ $ verify_time_stamp_token:
 $       subroutine
 $
 $               ! create the token from the response first
-$               openssl ts -reply -in 'p2' -out 'p2'.token -token_out
+$               openssl ts -reply -in "''p2'" -out "''p2'-token" -token_out
 $               if $severity .ne. 1 then call error
-$               openssl ts -verify -queryfile 'p1' -in 'p2'.token -token_in -
-                        "-CAfile" tsaca.pem -untrusted tsa_cert1.pem
+$               openssl ts -verify -queryfile "''p1'" -in "''p2'-token" -
+                 -token_in "-CAfile" tsaca.pem -untrusted tsa_cert1.pem
 $               if $severity .ne. 1 then call error
-$               openssl ts -verify -data 'p3' -in 'p2'.token -token_in -
-                        "-CAfile" tsaca.pem -untrusted tsa_cert1.pem
+$               openssl ts -verify -data "''p3'" -in "''p2'-token" -
+                 -token_in "-CAfile" tsaca.pem -untrusted tsa_cert1.pem
 $               if $severity .ne. 1 then call error
 $       endsubroutine
 $
@@ -167,6 +170,8 @@ $	endsubroutine
 $
 $       ! Main body ----------------------------------------------------------
 $
+$       set noon
+$
 $       write sys$output "Setting up TSA test directory..."
 $       call setup_dir
 $
@@ -183,66 +188,68 @@ $	write sys$output "Creating req1.req time stamp request for file testtsa..."
 $       call create_time_stamp_request1
 $
 $       write sys$output "Printing req1.req..."
-$       call print_request req1.tsq
+$       call print_request "req1.tsq"
 $
 $       write sys$output "Generating valid response for req1.req..."
-$       call create_time_stamp_response req1.tsq resp1.tsr tsa_config1
+$       call create_time_stamp_response "req1.tsq" "resp1.tsr" "tsa_config1"
 $
 $       write sys$output "Printing response..."
-$       call print_response resp1.tsr
+$       call print_response "resp1.tsr"
 $
 $       write sys$output "Verifying valid response..."
-$       call verify_time_stamp_response req1.tsq resp1.tsr [-]testtsa.com
+$       call verify_time_stamp_response "req1.tsq" "resp1.tsr" "[-]testtsa.com"
 $
 $       write sys$output "Verifying valid token..."
-$       call verify_time_stamp_token req1.tsq resp1.tsr [-]testtsa.com
+$       call verify_time_stamp_token "req1.tsq" "resp1.tsr" "[-]testtsa.com"
 $
 $       ! The tests below are commented out, because invalid signer certificates
 $       ! can no longer be specified in the config file.
 $
 $       ! write sys$output "Generating _invalid_ response for req1.req..."
-$       ! call create_time_stamp_response req1.tsq resp1_bad.tsr tsa_config2
+$       ! call create_time_stamp_response "req1.tsq" "resp1_bad.tsr" "tsa_config2"
 $
 $       ! write sys$output "Printing response..."
-$       ! call print_response resp1_bad.tsr
+$       ! call print_response "resp1_bad.tsr"
 $
 $       ! write sys$output "Verifying invalid response, it should fail..."
-$       ! call verify_time_stamp_response_fail req1.tsq resp1_bad.tsr
+$       ! call verify_time_stamp_response_fail "req1.tsq" "resp1_bad.tsr"
 $
 $       write sys$output "Creating req2.req time stamp request for file testtsa..."
 $       call create_time_stamp_request2
 $
 $       write sys$output "Printing req2.req..."
-$       call print_request req2.tsq
+$       call print_request "req2.tsq"
 $
 $       write sys$output "Generating valid response for req2.req..."
-$       call create_time_stamp_response req2.tsq resp2.tsr tsa_config1
+$       call create_time_stamp_response "req2.tsq" "resp2.tsr" "tsa_config1"
 $
 $       write sys$output "Checking '-token_in' and '-token_out' options with '-reply'..."
-$       call time_stamp_response_token_test req2.tsq resp2.tsr
+$       call time_stamp_response_token_test "req2.tsq" "resp2.tsr"
 $
 $       write sys$output "Printing response..."
-$       call print_response resp2.tsr
+$       call print_response "resp2.tsr"
 $
 $       write sys$output "Verifying valid response..."
-$       call verify_time_stamp_response req2.tsq resp2.tsr [-]testtsa.com
+$       call verify_time_stamp_response "req2.tsq" "resp2.tsr" "[-]testtsa.com"
 $
 $       write sys$output "Verifying response against wrong request, it should fail..."
-$       call verify_time_stamp_response_fail req1.tsq resp2.tsr
+$       call verify_time_stamp_response_fail "req1.tsq" "resp2.tsr"
 $
 $       write sys$output "Verifying response against wrong request, it should fail..."
-$       call verify_time_stamp_response_fail req2.tsq resp1.tsr
+$       call verify_time_stamp_response_fail "req2.tsq" "resp1.tsr"
 $
 $       write sys$output "Creating req3.req time stamp request for file CAtsa.cnf..."
 $       call create_time_stamp_request3
 $
 $       write sys$output "Printing req3.req..."
-$       call print_request req3.tsq
+$       call print_request "req3.tsq"
 $
 $       write sys$output "Verifying response against wrong request, it should fail..."
-$       call verify_time_stamp_response_fail req3.tsq resp1.tsr
+$       call verify_time_stamp_response_fail "req3.tsq" "resp1.tsr"
 $
 $       write sys$output "Cleaning up..."
 $       call clean_up_dir
 $
+$       set on
+$
 $       exit