The branch master has been updated
via 7498162d753fc21aa4a30cb0855479dac0515f5c (commit)
via 9481a301e4736f24042ddeb2a75b52f02272e442 (commit)
via 16dc790f47cd38b4d9e9cdefc6e6781075a773f4 (commit)
via 1c450706da5e7d1c54f130d2f90657539c19d8cd (commit)
via afea0067ff1ef5040a5e3a7618d0007b3d4923c0 (commit)
via a90f8d7641d89bf36203784527b298c117e41335 (commit)
from 7304e329bc3a91479ab77704a30d43fcc1376ea0 (commit)
- Log -----------------------------------------------------------------
commit 7498162d753fc21aa4a30cb0855479dac0515f5c
Author: Richard Levitte <[email protected]>
Date: Sat Jul 9 11:06:44 2016 +0200
VMS: Adjust the engines directory by adding the pointer size to its name
With OpenSSL 1.1 and on, the engines are tightly tied to the shared
library they're to be used with. That makes them depend on the
pointer size as well as the shared library version, and this gets
reflected in the name of the directory they're installed in.
Reviewed-by: Rich Salz <[email protected]>
commit 9481a301e4736f24042ddeb2a75b52f02272e442
Author: Richard Levitte <[email protected]>
Date: Fri Jul 8 18:38:31 2016 +0200
VMS: Small cleanups
Reviewed-by: Rich Salz <[email protected]>
commit 16dc790f47cd38b4d9e9cdefc6e6781075a773f4
Author: Richard Levitte <[email protected]>
Date: Fri Jul 8 18:35:38 2016 +0200
VMS: OSSL$EXE: needs to reflect that programs are installed in two places
We're installing architecture dependent (compiled) programs in
architecture specific directories, while architecture independent
programs (scripts) get installed in the general programs directory.
OSSL$EXE: reflects that by having two values.
Reviewed-by: Rich Salz <[email protected]>
commit 1c450706da5e7d1c54f130d2f90657539c19d8cd
Author: Richard Levitte <[email protected]>
Date: Fri Jul 8 18:34:21 2016 +0200
VMS: Document the changed logical names in VMS/openssl_staryup.com.in
Since there's been quite some changes, documentation needs updating
Reviewed-by: Rich Salz <[email protected]>
commit afea0067ff1ef5040a5e3a7618d0007b3d4923c0
Author: Richard Levitte <[email protected]>
Date: Fri Jul 8 18:30:43 2016 +0200
VMS: Present OPENSSLDIR according to the VMS setup.
This mostly affects 'openssl version -a', which might as well display
what we're actually looking at.
Reviewed-by: Rich Salz <[email protected]>
commit a90f8d7641d89bf36203784527b298c117e41335
Author: Richard Levitte <[email protected]>
Date: Fri Jul 8 18:27:56 2016 +0200
VMS: Simplify the spec of the default certs & keys area.
We previously had a number of logical names for the different parts.
There's really no need for that, the default directories are in one
directory tree. So we only define OSSL$DATAROOT: and make everything
related to that one.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 13 +++++-----
VMS/openssl_shutdown.com.in | 1 +
VMS/openssl_startup.com.in | 49 ++++++++++++++++++++++----------------
crypto/include/internal/cryptlib.h | 8 +++----
4 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index c53c500..b3cf430 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -152,11 +152,13 @@ SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -}
OPENSSLDIR={- catdir($config{openssldir}) ||
$config{prefix} ? catdir($config{prefix},"COMMON")
: "SYS\$COMMON:[OPENSSL-COMMON]" -}
-# Where installed engines reside
-ENGINESDIR={- $osslprefix -}ENGINES{- $sover -}:
+# The same, but for C
+OPENSSLDIR_C={- $osslprefix -}DATAROOT:[000000]
+# Where installed engines reside, for C
+ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover.$target{pointer_size} -}:
CC= {- $target{cc} -}
-CFLAGS= /DEFINE=({- join(",", @{$target{defines}},
@{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"")
-}) {- $target{cflags} -} {- $config{cflags} -}
+CFLAGS= /DEFINE=({- join(",", @{$target{defines}},
@{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"")
-}) {- $target{cflags} -} {- $config{cflags} -}
CFLAGS_Q=$(CFLAGS)
DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})
LDFLAGS= {- $target{lflags} -}
@@ -396,16 +398,15 @@ install_runtime : check_INSTALLTOP
COPY/PROT=W:RE [.APPS]openssl.EXE -
ossl_installroot:[EXE.'arch']openssl{- $osslver -}.EXE
@ ! Install scripts
- - CREATE/DIR ossl_installroot:[EXE]
COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]
@ ! {- output_on() if $disabled{apps}; "" -}
install_engines : check_INSTALLTOP
@ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !
@ WRITE SYS$OUTPUT "*** Installing engines"
- - CREATE/DIR ossl_installroot:[ENGINES{- $sover -}.'arch']
+ - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size}
-}.'arch']
{- join("\n ",
- map { "COPY/PROT=W:RE $_.EXE
ossl_installroot:[ENGINES$sover.'arch']" }
+ map { "COPY/PROT=W:RE $_.EXE
ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" }
grep(!m|ossltest$|i, @{$unified_info{engines}})) -}
@ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 81cf4ea..385903f 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -29,6 +29,7 @@ $ DEAS := DEASSIGN /NOLOG 'P1'
$ sv := {- sprintf "%02d%02d", $config{shlib_major},
$config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$
+$ DEAS OSSL$DATAROOT
$ DEAS OSSL$INSTROOT
$ DEAS OSSL$INCLUDE
$ DEAS OSSL$LIB
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index ca2220e..511c133 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -6,26 +6,33 @@ $ ! defined by P1.
$ !
$ ! The logical names created are:
$ !
-$ ! OSSL$ROOTnnn Installation root
-$ ! OSSL$EXEnnn Where the executables are located
-$ ! OSSL$LIBnnn Where the library files are located
-$ ! OSSL$SHAREnnn Where the sahreable images are located
-$ ! OSSL$INCLUDEnnn Include directory root
-$ ! OSSL$ENGINESnnn Where the sahreable images are located
+$ ! OSSL$INSTROOT Installation root
+$ ! OSSL$DATAROOT Data root (common directory
+$ ! for certs etc)
+$ ! OSSL$INCLUDE Include directory root
+$ ! OSSL$LIB Where the static library files
+$ ! are located
+$ ! OSSL$SHARE Where the shareable image files
+$ ! are located
+$ ! OSSL$EXE Where the executables are located
+$ ! OSSL$ENGINESnnn Where the shareable images are located
+$ ! OSSL$LIBCRYPTO The static crypto library
+$ ! OSSL$LIBSSL The static ssl library
+$ ! OSSL$LIBCRYPTOnnn_SHR The shareable crypto image
+$ ! OSSL$LIBSSLnnn_SHR The shareable ssl image
+$ ! OPENSSL is OSSL$INCLUDE:[OPENSSL]
$ !
$ ! In all these, nnn is the OpenSSL version number. This allows
-$ ! several OpenSSL versions to be installed simultaneously.
+$ ! several OpenSSL versions to be installed simultaneously, which
+$ ! matters for applications that are linked to the shareable images
+$ ! or that depend on engines.
$ !
$ ! In addition, unless P2 is "NOALIASES", these logical names are
$ ! created:
$ !
-$ ! OSSL$ROOT Alias for OSSL$ROOTnnn
-$ ! OSSL$EXE Alias for OSSL$EXEnnn
-$ ! OSSL$LIB Alias for OSSL$LIBnnn
-$ ! OSSL$SHARE Alias for OSSL$SHAREnnn
-$ ! OSSL$INCLUDE Alias for OSSL$INCLUDEnnn
-$ ! OPENSSL is OSSL$INCLUDE:[OPENSSL]
-$ ! OSSL$ENGINES Alias for OSSL$ENGINESnnn
+$ ! OSSL$ENGINES Alias for OSSL$ENGINESnnn
+$ ! OSSL$LIBCRYPTO_SHR Alias for OSSL$LIBCRYPTOnnn_SHR
+$ ! OSSL$LIBSSL_SHR Alias for OSSL$LIBSSLnnn_SHR
$ !
$ ! P1 Qualifier(s) for DEFINE. "/SYSTEM" would be typical when
$ ! calling this script from SYS$STARTUP:SYSTARTUP_VMS.COM,
@@ -60,6 +67,7 @@ $ INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
- ".][000000" - "[000000." - "][" - "]A.;" + "."
$ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
- ".][000000" - "[000000." - "][" - "]A.;" + "."
+$
$ DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_INSTALLTOP 'INSTALLTOP_']
$ DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_OPENSSLDIR 'OPENSSLDIR_']
$
@@ -83,12 +91,14 @@ $ DEF := DEFINE /NOLOG 'P1'
$ sv := {- sprintf "%02d%02d", $config{shlib_major},
$config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$
+$ DEFT OSSL$DATAROOT 'OPENSSLDIR_']
$ DEFT OSSL$INSTROOT 'INSTALLTOP_']
$ DEFT OSSL$INCLUDE 'INSTALLTOP_'INCLUDE.]
$ DEF OSSL$LIB OSSL$INSTROOT:[LIB.'arch']
$ DEF OSSL$SHARE OSSL$INSTROOT:[LIB.'arch']
-$ DEF OSSL$ENGINES'sv' OSSL$INSTROOT:[ENGINES'sv'.'arch']
-$ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch']
+$ DEF OSSL$ENGINES'sv''pz' OSSL$INSTROOT:[ENGINES'sv''pz'.'arch']
+$ 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
$ DEF OSSL$LIBCRYPTO'sv'_SHR'pz'
OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
@@ -97,16 +107,13 @@ $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
$
$ IF P2 .NES. "NOALIASES"
$ THEN
-$ DEF OSSL$ENGINES OSSL$ENGINES'sv'
+$ DEF OSSL$ENGINES'pz' OSSL$ENGINES'sv''pz'
$ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz'
$ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz'
$ ENDIF
$
-$ DEFT OSSL$DATAROOT 'OPENSSLDIR_']
-$ DEF OSSL$CERTS OSSL$DATAROOT:[CERTS]
-$ DEF OSSL$PRIVATE OSSL$DATAROOT:[PRIVATE]
-$
$ bailout:
$ DEASSIGN WRK_INSTALLTOP
+$ DEASSIGN WRK_OPENSSLDIR
$
$ EXIT 'status'
diff --git a/crypto/include/internal/cryptlib.h
b/crypto/include/internal/cryptlib.h
index 5270ee9..91267b7 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -47,10 +47,10 @@ DEFINE_LHASH_OF(MEM);
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
# else
# define X509_CERT_AREA "OSSL$DATAROOT:[000000]"
-# define X509_CERT_DIR "OSSL$CERTS:"
-# define X509_CERT_FILE "OSSL$DATAROOT:cert.pem"
-# define X509_PRIVATE_DIR "OSSL$PRIVATE:"
-# define CTLOG_FILE "OSSL$DATAROOT:ct_log_list.cnf"
+# define X509_CERT_DIR "OSSL$DATAROOT:[CERTS]"
+# define X509_CERT_FILE "OSSL$DATAROOT:[000000]cert.pem"
+# define X509_PRIVATE_DIR "OSSL$DATAROOT:[PRIVATE]"
+# define CTLOG_FILE "OSSL$DATAROOT:[000000]ct_log_list.cnf"
# endif
# define X509_CERT_DIR_EVP "SSL_CERT_DIR"
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
