VMS updates.

Submitted by: Richard Levitte <levitte@stacken.kth.se>

4 files changed, 56 insertions, 5 deletions

diff --git a/test/testgen.com b/test/testgen.com
index c7a78f7637..ec302f524a 100644
--- a/test/testgen.com
+++ b/test/testgen.com
@@ -9,7 +9,9 @@ $	KEY = 512
 $	CA := [-.certs]testca.pem
 $
 $	set noon
-$	delete 'T'.1;*,'T'.2;*,'T'.key;*
+$	if f$search(T+".1;*") .nes. "" then delete 'T'.1;*
+$	if f$search(T+".2;*") .nes. "" then delete 'T'.2;*
+$	if f$search(T+".key;*") .nes. "" then delete 'T'.key;*
 $	set on
 $
 $	write sys$output "generating certificate request"
diff --git a/test/testss.com b/test/testss.com
index 34eaa7b7ad..ce2c4b43f6 100644
--- a/test/testss.com
+++ b/test/testss.com
@@ -8,6 +8,7 @@ $	digest="-mdc2"
 $	reqcmd := mcr 'exe_dir'openssl req
 $	x509cmd := mcr 'exe_dir'openssl x509 'digest'
 $	verifycmd := mcr 'exe_dir'openssl verify
+$	dummycnf := sys$disk:[-.apps]openssl-vms.cnf
 $
 $	CAkey="""keyCA.ss"""
 $	CAcert="""certCA.ss"""
@@ -48,14 +49,14 @@ $		write sys$output "error using 'x509' convert a certificate to a certificate r
 $		exit 3
 $	endif
 $
-$	'reqcmd' -verify -in 'CAreq' -noout
+$	'reqcmd' -config 'dummycnf' -verify -in 'CAreq' -noout
 $	if $severity .ne. 1
 $	then
 $		write sys$output "first generated request is invalid"
 $		exit 3
 $	endif
 $
-$	'reqcmd' -verify -in 'CAreq2' -noout
+$	'reqcmd' -config 'dummycnf' -verify -in 'CAreq2' -noout
 $	if $severity .ne. 1
 $	then
 $		write sys$output "second generated request is invalid"
@@ -101,4 +102,4 @@ $
 $	write sys$output "The generated user certificate is ",Ucert
 $	write sys$output "The generated user private key is ",Ukey
 $
-$	delete err.ss;*
+$	if f$search("err.ss;*") .nes. "" then delete err.ss;*
diff --git a/test/testssl.com b/test/testssl.com
index 06c9f657a7..93a9aef802 100644
--- a/test/testssl.com
+++ b/test/testssl.com
@@ -54,6 +54,54 @@ $	write sys$output "test sslv2/sslv3 with both client and server authentication"
 $	mcr 'exe_dir'ssltest -server_auth -client_auth "-CAfile" certs.tmp
 $	if $severity .ne. 1 then goto exit3
 $
+$	write sys$output "test sslv2 via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl2 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2 with server authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2 with client authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl2 -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2 with both client and server authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv3 via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl3 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv3 with server authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv3 with client authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl3 -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+ 
+$	write sys$output "test sslv3 with both client and server authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2/sslv3 via BIO pair"
+$	mcr 'exe_dir'ssltest 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2/sslv3 with server authentication"
+$	mcr 'exe_dir'ssltest -bio_pair -server_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2/sslv3 with client authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
+$	write sys$output "test sslv2/sslv3 with both client and server authentication via BIO pair"
+$	mcr 'exe_dir'ssltest -bio_pair -server_auth -client_auth "-CAfile" certs.tmp 
+$	if $severity .ne. 1 then goto exit3
+$
 $	RET = 1
 $	goto exit
 $ exit3:
diff --git a/test/treq.com b/test/treq.com
index 6483fa0672..9eb1d26f6e 100644
--- a/test/treq.com
+++ b/test/treq.com
@@ -4,7 +4,7 @@ $	__arch := VAX
 $	if f$getsyi("cpu") .ge. 128 then __arch := AXP
 $	exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
-$	cmd := mcr 'exe_dir'openssl req
+$	cmd := mcr 'exe_dir'openssl req -config [-.apps]openssl-vms.cnf
 $
 $	t := testreq.pem
 $	if p1 .nes. "" then t = p1