Commit d17d3293 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix some VMS inconsistencies 



- The install top is versioned by default.  However, only the major
  version should be used.
- the default areas for certs, private keys an config files have
  changed, now all prefixed with 'OSSL$'.  This gets reflected in
  cryptlib.h.
- [.VMS]openssl_startup.com.in had some faults regarding creating
  rooted concealed logical names.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent dbb3aba1

Configurations/descrip.mms.tmpl

+4 −8
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl 
DESTDIR=



# Do not edit this manually. Use Configure --prefix=DIR to change this!

INSTALLTOP={- (my $x = $config{version}) =~ s|\.|_|g;

INSTALLTOP={- my $x = sprintf "%02d%02d", split(/\./, $config{version});

              our $installtop =

                  catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-$x]";

                  catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL$x]";

              $installtop -}

SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -}

# This is the standard central area to store certificates, private keys...
@@ -407,12 +407,8 @@ install_engines : check_INSTALLTOP 
install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -

                 [.VMS]openssl_utils.com, check_INSTALLTOP

        - CREATE/DIR ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE -

                [.VMS]openssl_startup.com,openssl_startup.com -

                ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE -

                [.VMS]openssl_startup.com,openssl_shutdown.com -

                ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE [.VMS]openssl_startup.com ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE [.VMS]openssl_shutdown.com ossl_installroot:[SYS$STARTUP]

        COPY/PROT=W:RE [.VMS]openssl_utils.com ossl_installroot:[SYS$STARTUP]



[.VMS]openssl_startup.com : vmsconfig.pm {- sourcefile("VMS", "openssl_startup.com.in") -}

VMS/openssl_startup.com.in

+7 −7
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ $ 
$	! Make sure that INSTALLTOP and OPENSSLDIR become something one

$	! can build concealed logical names on

$	INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -

		     - ".][000000" - "[000000." - "][" - "]A.;" + ".]"

		     - ".][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_'

		     - ".][000000" - "[000000." - "][" - "]A.;" + "."

$	DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_INSTALLTOP 'INSTALLTOP_']

$	DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_OPENSSLDIR 'OPENSSLDIR_']

$

$	! Check that things are in place, and specifically, the stuff

$	! belonging to this architecture
@@ -84,8 +84,8 @@ $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} 
$	sv   := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}

$	pz   := {- $config{pointer_size} -}

$

$	DEFT OSSL$INSTROOT'v'		'INSTALLTOP_'

$	DEFT OSSL$INCLUDE'v'		OSSL$INSTROOT'v':[INCLUDE.]

$	DEFT OSSL$INSTROOT'v'		'INSTALLTOP_']

$	DEFT OSSL$INCLUDE'v'		'INSTALLTOP_'INCLUDE.]

$	DEF  OSSL$LIB'v'		OSSL$INSTROOT'v':[LIB.'arch']

$	DEF  OSSL$SHARE'v'		OSSL$INSTROOT'v':[LIB.'arch']

$	DEF  OSSL$ENGINES'v'		OSSL$INSTROOT'v':[ENGINES.'arch']
@@ -109,7 +109,7 @@ $ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz' 
$	    DEF OPENSSL			OSSL$INCLUDE:[OPENSSL]

$	ENDIF

$

$	DEFT OSSL$DATAROOT	'OPENSSLDIR_'

$	DEFT OSSL$DATAROOT	'OPENSSLDIR_']

$	DEF  OSSL$CERTS		OSSL$DATAROOT:[CERTS]

$	DEF  OSSL$PRIVATE	OSSL$DATAROOT:[PRIVATE]

$

crypto/include/internal/cryptlib.h

+5 −5
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ DEFINE_LHASH_OF(MEM); 
#  define X509_PRIVATE_DIR        OPENSSLDIR "/private"

#  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"

# else

#  define X509_CERT_AREA          "SSLROOT:[000000]"

#  define X509_CERT_DIR           "SSLCERTS:"

#  define X509_CERT_FILE          "SSLCERTS:cert.pem"

#  define X509_PRIVATE_DIR        "SSLPRIVATE:"

#  define CTLOG_FILE              "SSLROOT:ct_log_list.cnf"

#  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"

# endif



# define X509_CERT_DIR_EVP        "SSL_CERT_DIR"