X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=VMS%2Fopenssl_ivp.com.in;h=825a699c4f7ec5b672a3784a416f46cc8008fc39;hb=23573051a57ec68fe53f7fd0c3aa75ac6033c496;hp=950542bb671dca6ec6bd666413b55a2e57b6595f;hpb=3426de2262caee3283b88c40308b99009182fcd1;p=openssl.git

diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index 950542bb67..825a699c4f 100644
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -14,16 +14,16 @@ $	INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
 $	OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
 		     - ".][000000" - "[000000." - "][" - "]A.;" + "."
 $
-$	@'INSTALLTOP_'SYS$STARTUP]openssl_startup
-$	@'INSTALLTOP_'SYS$STARTUP]openssl_utils
-$
 $	v    := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
 $	pz   := {- $config{pointer_size} -}
 $	
+$	@'INSTALLTOP_'SYS$STARTUP]openssl_startup'v'
+$	@'INSTALLTOP_'SYS$STARTUP]openssl_utils'v'
+$
 $	IF F$SEARCH("OSSL$LIBCRYPTO''pz'") .EQS. "" -
-           .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" -
+           .OR. F$SEARCH("OSSL$LIBSSL''pz'") .EQS. "" {- output_off() if $config{no_shared}; "" -}-
            .OR. F$SEARCH("OSSL$LIBCRYPTO_SHR''pz'") .EQS. "" -
-           .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" -
+           .OR. F$SEARCH("OSSL$LIBSSL_SHR''pz'") .EQS. "" {- output_on() if $config{no_shared}; "" -}-
            .OR. F$SEARCH("OSSL$INCLUDE:[OPENSSL]crypto.h") .EQS. "" -
            .OR. F$SEARCH("OPENSSL:crypto.h") .EQS. "" -
            .OR. F$SEARCH("OSSL$EXE:OPENSSL''v'.EXE") .EQS. ""
@@ -32,9 +32,19 @@ $	    WRITE SYS$ERROR "Installation inconsistent"
 $	    EXIT %x00018292 ! RMS$_FNF, file not found
 $	ENDIF
 $
+$	ON ERROR THEN GOTO error
+$
 $	! If something else is wrong with the installation, we're likely
 $	! to get an image activation error here
 $	openssl version -a
 $
+$	! FUTURE ENHANCEMENT: Verify that engines are where they should be.
+$	! openssl engine -c -t checker
+$
 $	WRITE SYS$ERROR "OpenSSL IVP passed"
 $	EXIT %x10000001
+$
+$ error:
+$	save_status = $STATUS
+$	WRITE SYS$ERROR "OpenSSL IVP failed"
+$	EXIT 'save_status'