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

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: default avatarRich Salz <rsalz@openssl.org>
parent 7304e329

VMS/openssl_shutdown.com.in

+1 −0
Original line number Diff line number Diff line
@@ -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

VMS/openssl_startup.com.in

+1 −4
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ $ 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']
@@ -102,10 +103,6 @@ $ 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

$

crypto/include/internal/cryptlib.h

+4 −4
Original line number Diff line number Diff line
@@ -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"