The branch openssl-3.0 has been updated
via 2daa2a0d00c39e9ff1d79d296c3d48b3db1e72ce (commit)
via 71a78784e8f000703267276b2f87d055bfa0e00e (commit)
via fe27680fc6395f661f3949e9e1ef0a83e499e87b (commit)
via 73e47e39a52d8e1c7515e140b8613304b8abe7ac (commit)
via 883008b21ba076b7d87aa8bec1419e8036539a3e (commit)
via a4f1e23e6cffdf2ef1aadf96572c251e07869787 (commit)
via e30545e9bd84e3ace70fb1e1c5ad6d824545fe36 (commit)
via 3c9293b4715229dc7ea2116d22c623c2a92ac69a (commit)
from 3bf7b73ea7123045b8f972badc67ed6878e6c37f (commit)
- Log -----------------------------------------------------------------
commit 2daa2a0d00c39e9ff1d79d296c3d48b3db1e72ce
Author: Richard Levitte <levi...@openssl.org>
Date: Mon Dec 13 08:44:54 2021 +0100
Fix VMS installation - Document in CHANGES.md
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit 71a78784e8f000703267276b2f87d055bfa0e00e
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Dec 10 16:56:39 2021 +0100
Fix VMS installation - Override the openssl logical name in descrip.mms.tmpl
This was part of 0cbb6f6a9ac5aa3ff813ef2e5afe6e443708ee20, but was
incomplete in that commit.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit fe27680fc6395f661f3949e9e1ef0a83e499e87b
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:40:49 2021 +0200
Fix VMS installation - Check the presence of providers in the IVP script
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit 73e47e39a52d8e1c7515e140b8613304b8abe7ac
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:37:56 2021 +0200
Fix VMS installation - deassign the same logical names that were defined
The logical name for the engines directory is named one way in
VMS/openssl_startup.com.in, but a different name was deassigned in
VMS/openssl_shutdown.com.in.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit 883008b21ba076b7d87aa8bec1419e8036539a3e
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:36:15 2021 +0200
Fix VMS installation - use platform->shlib_version_as_filename()
consistently
It's used in Configurations/descrip.mms.tmpl, but was forgotten in the
VMS installation scripts.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit a4f1e23e6cffdf2ef1aadf96572c251e07869787
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:32:43 2021 +0200
Fix VMS installation - Define the logical name OSSL$MODULES
Also, the modules installation directory is version agnostic on other
platforms, there's no real reason why it shouldn't be on VMS.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit e30545e9bd84e3ace70fb1e1c5ad6d824545fe36
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:27:50 2021 +0200
Fix VMS installation - $config{pointer_size} -> $target{pointer_size}
Configurations/descrip.mms.tmpl uses $target{pointer_size}, not
$config{pointer_size}, so the same should be used in installation
scripts, for consistency.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
commit 3c9293b4715229dc7ea2116d22c623c2a92ac69a
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Oct 15 12:22:04 2021 +0200
Fix VMS installation - consistent program names with version info
The program name version info is supposed to be the major release
version number. This was forgotten when the versioning scheme was
changed for 3.0, so the minor release version number slipped in as
well.
Reviewed-by: Tomas Mraz <to...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16842)
-----------------------------------------------------------------------
Summary of changes:
CHANGES.md | 6 +++++-
Configurations/descrip.mms.tmpl | 25 +++++++++++++++----------
VMS/openssl_ivp.com.in | 10 ++++++++--
VMS/openssl_shutdown.com.in | 9 +++++----
VMS/openssl_startup.com.in | 8 +++++---
VMS/openssl_utils.com.in | 2 +-
6 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 21e8d2029a..a8c1bb51ab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,11 @@ breaking changes, and mappings for the large list of
deprecated functions.
### Changes between 3.0.0 and 3.0.1 [xx XXX xxxx]
- *
+ * Corrected a few file name and file reference bugs in the build,
+ installation and setup scripts, which lead to installation verification
+ failures. Slightly enhanced the installation verification script.
+
+ *Richard Levitte*
### Changes between 1.1.1 and 3.0.0 [7 sep 2021]
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 9767802e88..c819733765 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -9,7 +9,7 @@
(our $osslprefix_q = platform->osslprefix()) =~ s/\$/\\\$/;
our $sover_dirname = platform->shlib_version_as_filename();
- our $osslver = sprintf "%02d%02d", split(/\./, $config{version});
+ our $osslver = sprintf "%02d", split(/\./, $config{version});
our $sourcedir = $config{sourcedir};
our $builddir = $config{builddir};
@@ -356,7 +356,7 @@ OPENSSLDIR_C={- platform->osslprefix() -}DATAROOT:[000000]
# Where installed ENGINE modules reside, for C
ENGINESDIR_C={- platform->osslprefix() -}ENGINES{-
$sover_dirname.$target{pointer_size} -}:
# Where modules reside, for C
-MODULESDIR_C={- platform->osslprefix() -}MODULES{-
$sover_dirname.$target{pointer_size} -}:
+MODULESDIR_C={- platform->osslprefix() -}MODULES{- $target{pointer_size} -}:
##### User defined commands and flags ################################
@@ -429,7 +429,9 @@ NODEBUG=@
$(NODEBUG) ! them, so we create it instead. This is an unfortunate
$(NODEBUG) ! necessity.
$(NODEBUG) !
- $(NODEBUG) DEFINE openssl "{- sourcedir('include/openssl') -}
+ $(NODEBUG) openssl_inc1 =
F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;"
+ $(NODEBUG) openssl_inc2 =
F$PARSE("sourcetop:[include.openssl]","A.;",,,"SYNTAX_ONLY") - "A.;"
+ $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2'
$(NODEBUG) !
$(NODEBUG) ! Figure out the architecture
$(NODEBUG) !
@@ -442,9 +444,10 @@ NODEBUG=@
.LAST :
$(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) }
@shlibs) || "!" -}
+ $(NODEBUG) DEASSIGN openssl
$(NODEBUG) DEASSIGN ossl_dataroot
$(NODEBUG) DEASSIGN ossl_installroot
- $(NODEBUG) DEASSIGN openssl
+ $(NODEBUG) DEASSIGN ossl_sourceroot
.DEFAULT :
@ ! MMS cannot handle no actions...
@@ -570,10 +573,10 @@ uninstall_docs : uninstall_html_docs
{- output_off() if $disabled{fips}; "" -}
install_fips : build_sw $(INSTALL_FIPSMODULECONF)
@ WRITE SYS$OUTPUT "*** Installing FIPS module"
- - CREATE/DIR ossl_installroot:[MODULES{-
$sover_dirname.$target{pointer_size} -}.'arch']
+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size}
-}.'arch']
- CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000]
COPY/PROT=W:RE $(INSTALL_FIPSMODULES) -
- ossl_installroot:[MODULES{-
$sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME)
+ ossl_installroot:[MODULES{- $target{pointer_size}
-}.'arch']$(FIPSMODULENAME)
@ WRITE SYS$OUTPUT "*** Installing FIPS module configuration"
COPY/PROT=W:RE $(INSTALL_FIPSMODULECONF) OSSL_DATAROOT:[000000]
@@ -581,7 +584,7 @@ uninstall_fips :
@ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration"
DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;*
@ WRITE SYS$OUTPUT "*** Uninstalling FIPS module"
- DELETE ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size}
-}.'arch']$(FIPSMODULENAME);*
+ DELETE ossl_installroot:[MODULES{- $target{pointer_size}
-}.'arch']$(FIPSMODULENAME);*
{- output_on() if $disabled{fips}; "" -}
install_ssldirs : check_INSTALLTOP
@@ -610,7 +613,9 @@ install_dev : check_INSTALLTOP install_runtime_libs
@ WRITE SYS$OUTPUT "*** Installing development files"
@ ! Install header files
- CREATE/DIR ossl_installroot:[include.openssl]
- COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl]
+ COPY/PROT=W:R ossl_sourceroot:[include.openssl]*.h -
+ ossl_installroot:[include.openssl]
+ COPY/PROT=W:R [.include.openssl]*.h ossl_installroot:[include.openssl]
@ ! Install static (development) libraries
- CREATE/DIR ossl_installroot:[LIB.'arch']
{- join("\n ",
@@ -629,9 +634,9 @@ install_engines : check_INSTALLTOP install_runtime_libs
build_modules
install_modules : check_INSTALLTOP install_runtime_libs build_modules
@ {- output_off() unless scalar @install_modules; "" -} !
@ WRITE SYS$OUTPUT "*** Installing modules"
- - CREATE/DIR ossl_installroot:[MODULES{-
$sover_dirname.$target{pointer_size} -}.'arch']
+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size}
-}.'arch']
{- join("\n ",
- map { "COPY/PROT=W:RE $_.EXE
ossl_installroot:[MODULES$sover_dirname$target{pointer_size}.'arch']" }
+ map { "COPY/PROT=W:RE $_.EXE
ossl_installroot:[MODULES$target{pointer_size}.'arch']" }
@install_modules) -}
@ {- output_on() unless scalar @install_modules; "" -} !
diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index 825a699c4f..6810792b38 100644
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -14,8 +14,8 @@ $ INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
$ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
- ".][000000" - "[000000." - "][" - "]A.;" + "."
$
-$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
-$ pz := {- $config{pointer_size} -}
+$ v := {- sprintf "%02d", split(/\./, $config{version}) -}
+$ pz := {- $target{pointer_size} -}
$
$ @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v'
$ @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v'
@@ -41,6 +41,12 @@ $
$ ! FUTURE ENHANCEMENT: Verify that engines are where they should be.
$ ! openssl engine -c -t checker
$
+$ ! Verify that the built in providers are reachable. If they aren't,
+$ ! then we're likely to get an image activation error here
+$ openssl list -provider base -providers
+$ openssl list -provider default -providers
+$ openssl list -provider legacy -providers
+$
$ WRITE SYS$ERROR "OpenSSL IVP passed"
$ EXIT %x10000001
$
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index c3b8de8b6d..4193c900f9 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -26,15 +26,16 @@ $ ENDIF
$
$ ! Abbrevs
$ DEAS := DEASSIGN /NOLOG 'P1'
-$ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version} -}
-$ pz := {- $config{pointer_size} -}
+$ sv := {- platform->shlib_version_as_filename(); -}
+$ pz := {- $target{pointer_size} -}
$
$ DEAS OSSL$DATAROOT
$ DEAS OSSL$INSTROOT
$ DEAS OSSL$INCLUDE
$ DEAS OSSL$LIB
$ DEAS OSSL$SHARE
-$ DEAS OSSL$ENGINES'sv'
+$ DEAS OSSL$ENGINES'sv''pz'
+$ DEAS OSSL$MODULES'pz'
$ DEAS OSSL$EXE
$ DEAS OSSL$LIBCRYPTO'pz'
$ DEAS OSSL$LIBSSL'pz'
@@ -46,7 +47,7 @@ $ DEAS OPENSSL
$
$ IF P2 .NES. "NOALIASES"
$ THEN
-$ DEAS OSSL$ENGINES
+$ DEAS OSSL$ENGINES'pz'
${- output_off() if $config{no_shared}; "" -}
$ DEAS OSSL$LIBCRYPTO_SHR'pz'
$ DEAS OSSL$LIBSSL_SHR'pz'
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index a6624eb698..bbf3e3b4e6 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -15,7 +15,8 @@ $ ! 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$ENGINESnnn Where the engines modules are located
+$ ! OSSL$MODULES Where the non-engine modules are located
$ ! OSSL$LIBCRYPTO The static crypto library
$ ! OSSL$LIBSSL The static ssl library
$ ! OSSL$LIBCRYPTOnnn_SHR The shareable crypto image
@@ -88,8 +89,8 @@ $
$ ! Abbrevs
$ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
$ DEF := DEFINE /NOLOG 'P1'
-$ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version} -}
-$ pz := {- $config{pointer_size} -}
+$ sv := {- platform->shlib_version_as_filename(); -}
+$ pz := {- $target{pointer_size} -}
$
$ DEFT OSSL$DATAROOT 'OPENSSLDIR_']
$ DEFT OSSL$INSTROOT 'INSTALLTOP_']
@@ -97,6 +98,7 @@ $ DEFT OSSL$INCLUDE 'INSTALLTOP_'INCLUDE.]
$ DEF OSSL$LIB OSSL$INSTROOT:[LIB.'arch']
$ DEF OSSL$SHARE OSSL$INSTROOT:[LIB.'arch']
$ DEF OSSL$ENGINES'sv''pz' OSSL$INSTROOT:[ENGINES'sv''pz'.'arch']
+$ DEF OSSL$MODULES'pz' OSSL$INSTROOT:[MODULES'pz'.'arch']
$ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch'],-
OSSL$INSTROOT:[EXE]
$ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
diff --git a/VMS/openssl_utils.com.in b/VMS/openssl_utils.com.in
index edd733d7bb..900d0462c5 100644
--- a/VMS/openssl_utils.com.in
+++ b/VMS/openssl_utils.com.in
@@ -1,7 +1,7 @@
$ ! OpenSSL utilities
$ !
$
-$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$ v := {- sprintf "%02d", split(/\./, $config{version}) -}
$
$ OPENSSL'v' :== $OSSL$EXE:OPENSSL'v'
$ OPENSSL :== $OSSL$EXE:OPENSSL'v'
