We expect these scripts not to bail on error, so make sure that's what happens.
This commit is contained in:
parent
6c1982c5ce
commit
908df4d0f7
@ -21,10 +21,10 @@ $ cert=p2
|
|||||||
$ endif
|
$ endif
|
||||||
$ ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
|
$ 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$output testssl-x509-output.
|
||||||
$ define/user sys$error nla0:
|
$ define/user sys$error nla0:
|
||||||
$ mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
|
$ mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
|
||||||
$ set noon
|
|
||||||
$ define/user sys$error nla0:
|
$ define/user sys$error nla0:
|
||||||
$ search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
|
$ search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
|
||||||
$ if $severity .eq. 1
|
$ if $severity .eq. 1
|
||||||
@ -33,7 +33,6 @@ $ dsa_cert := YES
|
|||||||
$ else
|
$ else
|
||||||
$ dsa_cert := NO
|
$ dsa_cert := NO
|
||||||
$ endif
|
$ endif
|
||||||
$ set on
|
|
||||||
$ delete testssl-x509-output.;*
|
$ delete testssl-x509-output.;*
|
||||||
$
|
$
|
||||||
$ if p3 .eqs. ""
|
$ if p3 .eqs. ""
|
||||||
@ -161,14 +160,12 @@ $ if $severity .ne. 1 then goto exit3
|
|||||||
$
|
$
|
||||||
$!###########################################################################
|
$!###########################################################################
|
||||||
$
|
$
|
||||||
$ set noon
|
|
||||||
$ define/user sys$output nla0:
|
$ define/user sys$output nla0:
|
||||||
$ mcr 'exe_dir'openssl no-rsa
|
$ mcr 'exe_dir'openssl no-rsa
|
||||||
$ no_rsa=$SEVERITY
|
$ no_rsa=$SEVERITY
|
||||||
$ define/user sys$output nla0:
|
$ define/user sys$output nla0:
|
||||||
$ mcr 'exe_dir'openssl no-dh
|
$ mcr 'exe_dir'openssl no-dh
|
||||||
$ no_dh=$SEVERITY
|
$ no_dh=$SEVERITY
|
||||||
$ set on
|
|
||||||
$
|
$
|
||||||
$ if no_dh
|
$ if no_dh
|
||||||
$ then
|
$ then
|
||||||
@ -203,4 +200,5 @@ $ exit3:
|
|||||||
$ RET = 3
|
$ RET = 3
|
||||||
$ exit:
|
$ exit:
|
||||||
$ if p3 .eqs. "" then delete certs.tmp;*
|
$ if p3 .eqs. "" then delete certs.tmp;*
|
||||||
|
$ set on
|
||||||
$ exit 'RET'
|
$ exit 'RET'
|
||||||
|
@ -167,6 +167,8 @@ $ endsubroutine
|
|||||||
$
|
$
|
||||||
$ ! Main body ----------------------------------------------------------
|
$ ! Main body ----------------------------------------------------------
|
||||||
$
|
$
|
||||||
|
$ set noon
|
||||||
|
$
|
||||||
$ write sys$output "Setting up TSA test directory..."
|
$ write sys$output "Setting up TSA test directory..."
|
||||||
$ call setup_dir
|
$ call setup_dir
|
||||||
$
|
$
|
||||||
@ -245,4 +247,6 @@ $
|
|||||||
$ write sys$output "Cleaning up..."
|
$ write sys$output "Cleaning up..."
|
||||||
$ call clean_up_dir
|
$ call clean_up_dir
|
||||||
$
|
$
|
||||||
|
$ set on
|
||||||
|
$
|
||||||
$ exit
|
$ exit
|
||||||
|
Loading…
x
Reference in New Issue
Block a user