We expect these scripts not to bail on error, so make sure that's what happens.

This commit is contained in:
Richard Levitte 2010-11-18 22:31:01 +00:00
parent dda454434b
commit 5e2d3c9ec1
2 changed files with 6 additions and 4 deletions

View File

@ -21,10 +21,10 @@ $ cert=p2
$ endif
$ ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
$
$ set noon
$ define/user sys$output testssl-x509-output.
$ define/user sys$error nla0:
$ mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
$ set noon
$ define/user sys$error nla0:
$ search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
$ if $severity .eq. 1
@ -33,7 +33,6 @@ $ dsa_cert := YES
$ else
$ dsa_cert := NO
$ endif
$ set on
$ delete testssl-x509-output.;*
$
$ if p3 .eqs. ""
@ -161,14 +160,12 @@ $ if $severity .ne. 1 then goto exit3
$
$!###########################################################################
$
$ set noon
$ define/user sys$output nla0:
$ mcr 'exe_dir'openssl no-rsa
$ no_rsa=$SEVERITY
$ define/user sys$output nla0:
$ mcr 'exe_dir'openssl no-dh
$ no_dh=$SEVERITY
$ set on
$
$ if no_dh
$ then
@ -203,4 +200,5 @@ $ exit3:
$ RET = 3
$ exit:
$ if p3 .eqs. "" then delete certs.tmp;*
$ set on
$ exit 'RET'

View File

@ -167,6 +167,8 @@ $ endsubroutine
$
$ ! Main body ----------------------------------------------------------
$
$ set noon
$
$ write sys$output "Setting up TSA test directory..."
$ call setup_dir
$
@ -245,4 +247,6 @@ $
$ write sys$output "Cleaning up..."
$ call clean_up_dir
$
$ set on
$
$ exit