1 files changed, 7 insertions, 39 deletions

diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com
index d151cd3955..88a33d0531 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -6,17 +6,11 @@ $	__proc = f$element(0,";",f$environment("procedure"))
 $       __here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;"
 $       __save_default = f$environment("default")
 $       __arch := VAX
-$       if f$getsyi("cpu") .ge. 128 then -
-           __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$       if __arch .eqs. "" then __arch := UNK
+$       if f$getsyi("cpu") .ge. 128 then __arch := AXP
 $       texe_dir := sys$disk:[-.'__arch'.exe.test]
 $       exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
-$       sslroot = f$parse("sys$disk:[-.apps];",,,,"syntax_only") - "].;"+ ".]"
-$       define /translation_attributes = concealed sslroot 'sslroot'
-$
 $       set default '__here'
-$
 $       on control_y then goto exit
 $       on error then goto exit
 $
@@ -24,18 +18,14 @@ $	if p1 .nes. ""
 $       then
 $           tests = p1
 $       else
-$! NOTE: This list reflects the list of dependencies following the
-$! "alltests" target in Makefile.  This should make it easy to see
-$! if there's a difference that needs to be taken care of.
 $           tests := -
         test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,-
-        test_md2,test_mdc2,test_wp,-
-        test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_aes,-
+        test_md2,test_mdc2,-
+        test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,-
         test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
         test_enc,test_x509,test_rsa,test_crl,test_sid,-
         test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
-        test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,-
-        test_jpake,test_cms
+        test_ss,test_ca,test_engine,test_evp,test_ssl,test_ige,test_jpake
 $       endif
 $       tests = f$edit(tests,"COLLAPSE")
 $
@@ -53,7 +43,6 @@ $	MD2TEST :=	md2test
 $       MD4TEST :=      md4test
 $       MD5TEST :=      md5test
 $       HMACTEST :=     hmactest
-$       WPTEST :=       wp_test
 $       RC2TEST :=      rc2test
 $       RC4TEST :=      rc4test
 $       RC5TEST :=      rc5test
@@ -104,9 +93,6 @@ $	return
 $ test_hmac:
 $       mcr 'texe_dir''hmactest'
 $       return
-$ test_wp:
-$       mcr 'texe_dir''wptest'
-$       return
 $ test_md2:
 $       mcr 'texe_dir''md2test'
 $       return
@@ -262,22 +248,9 @@ $	    write sys$output "Generate and certify a test certificate via the 'ca' pro
 $           @testca.com
 $       endif
 $       return
-$ test_aes: 
-$!      write sys$output "test AES"
-$!      !mcr 'texe_dir''aestest'
-$       return
-$ test_tsa:
-$       set noon
-$       define/user sys$output nla0:
-$       mcr 'exe_dir'openssl no-rsa
-$       save_severity=$SEVERITY
-$       set on
-$       if save_severity
-$       then
-$           write sys$output "skipping testtsa.com test -- requires RSA"
-$       else
-$           @testtsa.com
-$       endif
+$ test_rd: 
+$       write sys$output "test Rijndael"
+$       !mcr 'texe_dir''rdtest'
 $       return
 $ test_ige: 
 $       write sys$output "Test IGE mode"
@@ -287,13 +260,8 @@ $ test_jpake:
 $       write sys$output "Test JPAKE"
 $       mcr 'texe_dir''jpaketest'
 $       return
-$ test_cms:
-$       write sys$output "CMS consistency test"
-$       perl CMS-TEST.PL
-$       return
 $
 $
 $ exit:
 $       set default '__save_default'
-$       deassign sslroot
 $       exit