projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid test_errstr in a cross compiled configuration
[oweals/openssl.git]
/
VMS
/
openssl_ivp.com.in
diff --git
a/VMS/openssl_ivp.com.in
b/VMS/openssl_ivp.com.in
index 950542bb671dca6ec6bd666413b55a2e57b6595f..825a699c4f7ec5b672a3784a416f46cc8008fc39 100644
(file)
--- 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.;" + "."
$
$ 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} -}
$
$ 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. "" -
$ 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$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. ""
.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
$
$ 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
$
$ ! 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
$ WRITE SYS$ERROR "OpenSSL IVP passed"
$ EXIT %x10000001
+$
+$ error:
+$ save_status = $STATUS
+$ WRITE SYS$ERROR "OpenSSL IVP failed"
+$ EXIT 'save_status'