diff options
author | djm <> | 2010-10-01 22:59:01 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:59:01 +0000 |
commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libssl/test/tests.com | |
parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libssl/test/tests.com')
-rw-r--r-- | src/lib/libssl/test/tests.com | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com index 88a33d0531..d151cd3955 100644 --- a/src/lib/libssl/test/tests.com +++ b/src/lib/libssl/test/tests.com | |||
@@ -6,11 +6,17 @@ $ __proc = f$element(0,";",f$environment("procedure")) | |||
6 | $ __here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;" | 6 | $ __here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;" |
7 | $ __save_default = f$environment("default") | 7 | $ __save_default = f$environment("default") |
8 | $ __arch := VAX | 8 | $ __arch := VAX |
9 | $ if f$getsyi("cpu") .ge. 128 then __arch := AXP | 9 | $ if f$getsyi("cpu") .ge. 128 then - |
10 | __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") | ||
11 | $ if __arch .eqs. "" then __arch := UNK | ||
10 | $ texe_dir := sys$disk:[-.'__arch'.exe.test] | 12 | $ texe_dir := sys$disk:[-.'__arch'.exe.test] |
11 | $ exe_dir := sys$disk:[-.'__arch'.exe.apps] | 13 | $ exe_dir := sys$disk:[-.'__arch'.exe.apps] |
12 | $ | 14 | $ |
15 | $ sslroot = f$parse("sys$disk:[-.apps];",,,,"syntax_only") - "].;"+ ".]" | ||
16 | $ define /translation_attributes = concealed sslroot 'sslroot' | ||
17 | $ | ||
13 | $ set default '__here' | 18 | $ set default '__here' |
19 | $ | ||
14 | $ on control_y then goto exit | 20 | $ on control_y then goto exit |
15 | $ on error then goto exit | 21 | $ on error then goto exit |
16 | $ | 22 | $ |
@@ -18,14 +24,18 @@ $ if p1 .nes. "" | |||
18 | $ then | 24 | $ then |
19 | $ tests = p1 | 25 | $ tests = p1 |
20 | $ else | 26 | $ else |
27 | $! NOTE: This list reflects the list of dependencies following the | ||
28 | $! "alltests" target in Makefile. This should make it easy to see | ||
29 | $! if there's a difference that needs to be taken care of. | ||
21 | $ tests := - | 30 | $ tests := - |
22 | test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,- | 31 | test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,- |
23 | test_md2,test_mdc2,- | 32 | test_md2,test_mdc2,test_wp,- |
24 | test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,- | 33 | test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_aes,- |
25 | test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- | 34 | test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- |
26 | test_enc,test_x509,test_rsa,test_crl,test_sid,- | 35 | test_enc,test_x509,test_rsa,test_crl,test_sid,- |
27 | test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- | 36 | test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- |
28 | test_ss,test_ca,test_engine,test_evp,test_ssl,test_ige,test_jpake | 37 | test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,- |
38 | test_jpake,test_cms | ||
29 | $ endif | 39 | $ endif |
30 | $ tests = f$edit(tests,"COLLAPSE") | 40 | $ tests = f$edit(tests,"COLLAPSE") |
31 | $ | 41 | $ |
@@ -43,6 +53,7 @@ $ MD2TEST := md2test | |||
43 | $ MD4TEST := md4test | 53 | $ MD4TEST := md4test |
44 | $ MD5TEST := md5test | 54 | $ MD5TEST := md5test |
45 | $ HMACTEST := hmactest | 55 | $ HMACTEST := hmactest |
56 | $ WPTEST := wp_test | ||
46 | $ RC2TEST := rc2test | 57 | $ RC2TEST := rc2test |
47 | $ RC4TEST := rc4test | 58 | $ RC4TEST := rc4test |
48 | $ RC5TEST := rc5test | 59 | $ RC5TEST := rc5test |
@@ -93,6 +104,9 @@ $ return | |||
93 | $ test_hmac: | 104 | $ test_hmac: |
94 | $ mcr 'texe_dir''hmactest' | 105 | $ mcr 'texe_dir''hmactest' |
95 | $ return | 106 | $ return |
107 | $ test_wp: | ||
108 | $ mcr 'texe_dir''wptest' | ||
109 | $ return | ||
96 | $ test_md2: | 110 | $ test_md2: |
97 | $ mcr 'texe_dir''md2test' | 111 | $ mcr 'texe_dir''md2test' |
98 | $ return | 112 | $ return |
@@ -248,9 +262,22 @@ $ write sys$output "Generate and certify a test certificate via the 'ca' pro | |||
248 | $ @testca.com | 262 | $ @testca.com |
249 | $ endif | 263 | $ endif |
250 | $ return | 264 | $ return |
251 | $ test_rd: | 265 | $ test_aes: |
252 | $ write sys$output "test Rijndael" | 266 | $! write sys$output "test AES" |
253 | $ !mcr 'texe_dir''rdtest' | 267 | $! !mcr 'texe_dir''aestest' |
268 | $ return | ||
269 | $ test_tsa: | ||
270 | $ set noon | ||
271 | $ define/user sys$output nla0: | ||
272 | $ mcr 'exe_dir'openssl no-rsa | ||
273 | $ save_severity=$SEVERITY | ||
274 | $ set on | ||
275 | $ if save_severity | ||
276 | $ then | ||
277 | $ write sys$output "skipping testtsa.com test -- requires RSA" | ||
278 | $ else | ||
279 | $ @testtsa.com | ||
280 | $ endif | ||
254 | $ return | 281 | $ return |
255 | $ test_ige: | 282 | $ test_ige: |
256 | $ write sys$output "Test IGE mode" | 283 | $ write sys$output "Test IGE mode" |
@@ -260,8 +287,13 @@ $ test_jpake: | |||
260 | $ write sys$output "Test JPAKE" | 287 | $ write sys$output "Test JPAKE" |
261 | $ mcr 'texe_dir''jpaketest' | 288 | $ mcr 'texe_dir''jpaketest' |
262 | $ return | 289 | $ return |
290 | $ test_cms: | ||
291 | $ write sys$output "CMS consistency test" | ||
292 | $ perl CMS-TEST.PL | ||
293 | $ return | ||
263 | $ | 294 | $ |
264 | $ | 295 | $ |
265 | $ exit: | 296 | $ exit: |
266 | $ set default '__save_default' | 297 | $ set default '__save_default' |
298 | $ deassign sslroot | ||
267 | $ exit | 299 | $ exit |