From: Richard Levitte <levitte@openssl.org>
Date: Fri, 8 Jul 2016 16:27:56 +0000 (+0200)
Subject: VMS: Simplify the spec of the default certs & keys area.
X-Git-Tag: OpenSSL_1_1_0-pre6~246
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=a90f8d7641d89bf36203784527b298c117e41335;ds=sidebyside

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 <rsalz@openssl.org>
---

diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 81cf4ea721..385903fa7d 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 ca2220efe7..d2c46d9de2 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -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
 $
diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index 5270ee942a..91267b78fc 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"