From fa849d738df6152441e0c50e26acfb03e6f8a3eb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 3 Aug 2016 12:53:49 +0200 Subject: [PATCH 1/1] VMS: If configured no-shared, don't provide shareable image logical names Reviewed-by: Rich Salz --- VMS/openssl_ivp.com.in | 4 ++-- VMS/openssl_shutdown.com.in | 4 ++++ VMS/openssl_startup.com.in | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in index 6a944fadef..3555bf6023 100644 --- a/VMS/openssl_ivp.com.in +++ b/VMS/openssl_ivp.com.in @@ -21,9 +21,9 @@ $ @'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. "" diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 385903fa7d..f0df1c1c35 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -38,15 +38,19 @@ $ DEAS OSSL$ENGINES'sv' $ DEAS OSSL$EXE $ DEAS OSSL$LIBCRYPTO'pz' $ DEAS OSSL$LIBSSL'pz' +${- output_off() if $config{no_shared}; "" -} $ DEAS OSSL$LIBCRYPTO'sv'_SHR'pz' $ DEAS OSSL$LIBSSL'sv'_SHR'pz' +${- output_on() if $config{no_shared}; "" -} $ DEAS OPENSSL $ $ IF P2 .NES. "NOALIASES" $ THEN $ DEAS OSSL$ENGINES +${- output_off() if $config{no_shared}; "" -} $ DEAS OSSL$LIBCRYPTO_SHR'pz' $ DEAS OSSL$LIBSSL_SHR'pz' +${- output_on() if $config{no_shared}; "" -} $ ENDIF $ $ EXIT 'status' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index 511c133f01..9c8c09ac9c 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -101,15 +101,19 @@ $ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch'],- OSSL$INSTROOT:[EXE] $ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB $ DEF OSSL$LIBSSL'pz' OSSL$LIB:OSSL$LIBSSL'pz'.OLB +${- output_off() if $config{no_shared}; "" -} $ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE $ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE +${- output_on() if $config{no_shared}; "" -} $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] $ $ IF P2 .NES. "NOALIASES" $ THEN $ DEF OSSL$ENGINES'pz' OSSL$ENGINES'sv''pz' +${- output_off() if $config{no_shared}; "" -} $ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz' $ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz' +${- output_on() if $config{no_shared}; "" -} $ ENDIF $ $ bailout: -- 2.34.1