[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Sat Jul 2 13:50:02 UTC 2016
The branch master has been updated
via d17d3293d112c3f32ac187ab7c33bb3a2c44ddba (commit)
via dbb3aba17ead133ce14530036f65b2457b6f8242 (commit)
via 8842005e75c2f42ed594a3b44189e0e5ac29be18 (commit)
via 34d5490a1dc0d3c27743879f303102528e567f82 (commit)
via 7878e536d026ffb234843dc16469b2295bbac43b (commit)
from 27c40a93175d4dcb559325db9354910b3d16cd4e (commit)
- Log -----------------------------------------------------------------
commit d17d3293d112c3f32ac187ab7c33bb3a2c44ddba
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jul 2 08:47:08 2016 +0200
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: Rich Salz <rsalz at openssl.org>
commit dbb3aba17ead133ce14530036f65b2457b6f8242
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jul 2 09:51:06 2016 +0200
Install the openssl app with version number on VMS
This makes it possible for script writers to lock on to a specific
version if they need to. Note that only the major version number is
used.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 8842005e75c2f42ed594a3b44189e0e5ac29be18
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jul 2 08:35:12 2016 +0200
Have the VMS shared library file names contain the shared version
Also, have the static library file names contain the pointer size when
applicable.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 34d5490a1dc0d3c27743879f303102528e567f82
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jul 2 08:31:00 2016 +0200
Pass down correct information to the VMS startup script templates
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 7878e536d026ffb234843dc16469b2295bbac43b
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jul 2 09:50:24 2016 +0200
Add the missing pointer_size information on VMS configs
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 7 +++++
Configurations/descrip.mms.tmpl | 43 +++++++++++++++----------------
VMS/openssl_shutdown.com.in | 19 ++++++++------
VMS/openssl_startup.com.in | 52 +++++++++++++++++++++-----------------
VMS/openssl_utils.com | 11 --------
VMS/openssl_utils.com.in | 14 ++++++++++
build.info | 12 ++++-----
crypto/include/internal/cryptlib.h | 10 ++++----
8 files changed, 92 insertions(+), 76 deletions(-)
delete mode 100644 VMS/openssl_utils.com
create mode 100644 VMS/openssl_utils.com.in
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e28fb12..4a9b925 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -106,6 +106,7 @@ sub vms_info {
my $pointer_size_str = $pointer_size == 0 ? "" : "$pointer_size";
$vms_info->{disable_warns} = [ ];
+ $vms_info->{pointer_size} = $pointer_size_str;
if ($pointer_size == 64) {
`PIPE CC /NOCROSS_REFERENCE /NOLIST /NOOBJECT /WARNINGS = DISABLE = ( MAYLOSEDATA3, EMPTYFILE ) NL: 2> NL:`;
if ($? == 0) {
@@ -1748,6 +1749,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(0)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(0)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(0)->{pointer_size} },
#as => "???",
#debug_aflags => "/NOOPTIMIZE/DEBUG",
#release_aflags => "/OPTIMIZE/NODEBUG",
@@ -1768,6 +1770,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(32)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(32)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(32)->{pointer_size} },
},
"vms-alpha-p64" => {
inherit_from => [ "vms-generic" ],
@@ -1784,6 +1787,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(64)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(64)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(64)->{pointer_size} },
},
"vms-ia64" => {
inherit_from => [ "vms-generic" ],
@@ -1797,6 +1801,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(0)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(0)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(0)->{pointer_size} },
#as => "I4S",
#debug_aflags => "/NOOPTIMIZE/DEBUG",
#release_aflags => "/OPTIMIZE/NODEBUG",
@@ -1817,6 +1822,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(32)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(32)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(32)->{pointer_size} },
},
"vms-ia64-p64" => {
inherit_from => [ "vms-generic" ],
@@ -1833,6 +1839,7 @@ sub vms_info {
? "LIBZ=\"\"\"".vms_info(64)->{def_zlib}."\"\"\"" : ();
}),
ex_libs => add(sub { return vms_info(64)->{zlib} || (); }),
+ pointer_size => sub { return vms_info(64)->{pointer_size} },
},
);
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 8211d01..f33801e 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -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...
@@ -388,7 +388,8 @@ install_runtime : check_INSTALLTOP
@ WRITE SYS$OUTPUT "*** Installing runtime files"
@ ! Install the main program
- CREATE/DIR ossl_installroot:[EXE.'arch']
- COPY/PROT=W:RE [.APPS]openssl.EXE ossl_installroot:[EXE.'arch']
+ COPY/PROT=W:RE [.APPS]openssl.EXE -
+ ossl_installroot:[EXE.'arch']openssl{- sprintf "%02d%02d", split(/\./, $config{version}) -}.EXE
@ ! Install scripts
- CREATE/DIR ossl_installroot:[EXE]
COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]
@@ -404,17 +405,11 @@ install_engines : check_INSTALLTOP
@ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !
install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
- check_INSTALLTOP
+ [.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 -
- {- sourcefile("VMS", "openssl_utils.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") -}
- CREATE/DIR [.VMS]
@@ -422,6 +417,12 @@ install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
{- sourcefile("VMS", "openssl_startup.com.in") -} -
> [.VMS]openssl_startup.com
+[.VMS]openssl_utils.com : vmsconfig.pm {- sourcefile("VMS", "openssl_utils.com.in") -}
+ - CREATE/DIR [.VMS]
+ $(PERL) "-I." "-Mvmsconfig" {- sourcefile("util", "dofile.pl") -} -
+ {- sourcefile("VMS", "openssl_utils.com.in") -} -
+ > [.VMS]openssl_utils.com
+
[.VMS]openssl_shutdown.com : vmsconfig.pm {- sourcefile("VMS", "openssl_shutdown.com.in") -}
- CREATE/DIR [.VMS]
$(PERL) "-I." "-Mvmsconfig" {- sourcefile("util", "dofile.pl") -} -
@@ -436,18 +437,14 @@ vmsconfig.pm : configdata.pm
WRITE CONFIG "our @ISA = qw(Exporter);"
WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);"
WRITE CONFIG "our %config = ("
- WRITE CONFIG " target => '{- $config{target} -}',"
- WRITE CONFIG " version => '$(MAJOR).$(MINOR)',"
+ WRITE CONFIG " target => '","{- $config{target} -}","',"
+ WRITE CONFIG " version => '","{- $config{version} -}","',"
+ WRITE CONFIG " shlib_major => '","{- $config{shlib_major} -}","',"
+ WRITE CONFIG " shlib_minor => '","{- $config{shlib_minor} -}","',"
WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","',"
WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)',"
WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)',"
- WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","',"
- WRITE CONFIG " shared_libs => ["
- {- $disabled{shared}
- ? "\@ !"
- : join("\n ", map { "WRITE CONFIG \" '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}})
- -}
- WRITE CONFIG " ],"
+ WRITE CONFIG " pointer_size => '","{- $target{pointer_size} -}","',"
WRITE CONFIG ");"
WRITE CONFIG "our %target = ();"
WRITE CONFIG "our %disabled = ();"
@@ -583,7 +580,7 @@ EOF
my $shlib = $args{shlib};
my $libd = dirname($lib);
my $libn = basename($lib);
- (my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib//i;
+ (my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib([^0-9]*)\d*/$1/i;
my @deps = map {
$disabled{shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 5385362..01971f3 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -24,14 +24,11 @@ $ arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
$ IF arch .EQS. "" THEN GOTO unknown_arch
$ ENDIF
$
-$ ! Generated information
-$ VERSION := {- $config{version} -}
-$ INSTALLTOP := {- $config{INSTALLTOP} -}
-$ POINTER_SIZE = {- $config{pointersize} -}
-$
$ ! Abbrevs
$ DEAS := DEASSIGN /NOLOG 'P1'
-$ v = VERSION - "." - "."
+$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
+$ pz := {- $config{pointer_size} -}
$
$ DEAS OSSL$ROOT'v'
$ DEAS OSSL$INCLUDE'v'
@@ -39,7 +36,10 @@ $ DEAS OSSL$LIB'v'
$ DEAS OSSL$SHARE'v'
$ DEAS OSSL$ENGINES'v'
$ DEAS OSSL$EXE'v'
-$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}'v'" } @{$config{shared_libs}}) -}
+$ DEAS OSSL$LIBCRYPTO'pz''v'
+$ DEAS OSSL$LIBSSL'pz''v'
+$ DEAS OSSL$LIBCRYPTO'sv'_SHR'pz'
+$ DEAS OSSL$LIBSSL'sv'_SHR'pz'
$ IF P2 .NES. "NOALIASES"
$ THEN
$ DEAS OSSL$ROOT
@@ -49,7 +49,10 @@ $ DEAS OSSL$SHARE
$ DEAS OSSL$ENGINES
$ DEAS OSSL$EXE
$ DEAS OPENSSL
-$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}" } @{$config{shared_libs}}) -}
+$ DEAS OSSL$LIBCRYPTO'pz'
+$ DEAS OSSL$LIBSSL'pz'
+$ DEAS OSSL$LIBCRYPTO_SHR'pz'
+$ DEAS OSSL$LIBSSL_SHR'pz'
$ ENDIF
$
$ EXIT 'status'
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index e5043b5..b5570ee 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -51,19 +51,17 @@ $ IF arch .EQS. "" THEN GOTO unknown_arch
$ ENDIF
$
$ ! Generated information
-$ VERSION := {- $config{version} -}
$ INSTALLTOP := {- $config{INSTALLTOP} -}
$ OPENSSLDIR := {- $config{OPENSSLDIR} -}
-$ POINTER_SIZE := {- $config{pointersize} -}
$
$ ! 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
@@ -82,28 +80,36 @@ $
$ ! Abbrevs
$ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
$ DEF := DEFINE /NOLOG 'P1'
-$ v = VERSION - "." - "."
+$ 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:[INCLUDE.]
-$ DEF OSSL$LIB'v' OSSL$INSTROOT:[LIB.'arch']
-$ DEF OSSL$SHARE'v' OSSL$INSTROOT:[LIB.'arch']
-$ DEF OSSL$ENGINES'v' OSSL$INSTROOT:[ENGINES.'arch']
-$ DEF OSSL$EXE'v' OSSL$INSTROOT:[EXE.'arch']
-$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -}
+$ 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']
+$ DEF OSSL$EXE'v' OSSL$INSTROOT'v':[EXE.'arch']
+$ DEF OSSL$LIBCRYPTO'pz''v' OSSL$LIB'v':OSSL$LIBCRYPTO'pz'.OLB
+$ DEF OSSL$LIBSSL'pz''v' OSSL$LIB'v':OSSL$LIBSSL'pz'.OLB
+$ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
+$ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBSSL'sv'_SHR'pz'.EXE
$ IF P2 .NES. "NOALIASES"
$ THEN
-$ DEF OSSL$INSTROOT OSSL$INSTROOT'v'
-$ DEF OSSL$INCLUDE OSSL$INCLUDE'v'
-$ DEF OSSL$LIB OSSL$LIB'v'
-$ DEF OSSL$SHARE OSSL$SHARE'v'
-$ DEF OSSL$ENGINES OSSL$ENGINES'v'
-$ DEF OSSL$EXE OSSL$EXE'v'
-$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
-$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -}
+$ DEF OSSL$INSTROOT OSSL$INSTROOT'v'
+$ DEF OSSL$INCLUDE OSSL$INCLUDE'v'
+$ DEF OSSL$LIB OSSL$LIB'v'
+$ DEF OSSL$SHARE OSSL$SHARE'v'
+$ DEF OSSL$ENGINES OSSL$ENGINES'v'
+$ DEF OSSL$EXE OSSL$EXE'v'
+$ DEF OSSL$LIBCRYPTO'pz' OSSL$LIBCRYPTO'pz''v'
+$ DEF OSSL$LIBSSL'pz' OSSL$LIBSSL'pz''v'
+$ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz'
+$ 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]
$
diff --git a/VMS/openssl_utils.com b/VMS/openssl_utils.com
deleted file mode 100644
index 09c75d9..0000000
--- a/VMS/openssl_utils.com
+++ /dev/null
@@ -1,11 +0,0 @@
-$ ! OpenSSL utilities
-$ !
-$
-$ OPENSSL :== $OSSL$EXE:OPENSSL
-$
-$ IF F$SYMBOL(PERL) .EQS. "STRING"
-$ THEN
-$ C_REHASH :== 'PERL' OSSL$EXE:c_rehash.pl
-$ ELSE
-$ WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
-$ ENDIF
diff --git a/VMS/openssl_utils.com.in b/VMS/openssl_utils.com.in
new file mode 100644
index 0000000..edd733d
--- /dev/null
+++ b/VMS/openssl_utils.com.in
@@ -0,0 +1,14 @@
+$ ! OpenSSL utilities
+$ !
+$
+$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$
+$ OPENSSL'v' :== $OSSL$EXE:OPENSSL'v'
+$ OPENSSL :== $OSSL$EXE:OPENSSL'v'
+$
+$ IF F$TYPE(PERL) .EQS. "STRING"
+$ THEN
+$ C_REHASH :== 'PERL' OSSL$EXE:c_rehash.pl
+$ ELSE
+$ WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
+$ ENDIF
diff --git a/build.info b/build.info
index cfaa712..fa136dc 100644
--- a/build.info
+++ b/build.info
@@ -31,11 +31,11 @@ ENDIF
# VMS has a cultural standard where all libraries are prefixed.
# For OpenSSL, the choice is 'ossl$' (this prefix was claimed in a
# conversation with VSI, Tuesday January 26 2016)
-# Also, it seems it's usual to have a suffix to the shared library name
-# for the different pointer sizes that were built for.
+# Also, it seems it's usual to have the pointer size the libraries
+# were built for as part of the name.
IF[{- $config{target} =~ /^vms/ -}]
- RENAME[libcrypto]=ossl$libcrypto
- RENAME[libssl]=ossl$libssl
- SHARED_NAME[libcrypto]=ossl$libcrypto_shr{- $target{pointer_size} -}
- SHARED_NAME[libssl]=ossl$libssl_shr{- $target{pointer_size} -}
+ RENAME[libcrypto]=ossl$libcrypto{- $target{pointer_size} -}
+ RENAME[libssl]=ossl$libssl{- $target{pointer_size} -}
+ SHARED_NAME[libcrypto]=ossl$libcrypto{- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}_shr{- $target{pointer_size} -}
+ SHARED_NAME[libssl]=ossl$libssl{- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}_shr{- $target{pointer_size} -}
ENDIF
diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index c9f76ba..5270ee9 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -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"
More information about the openssl-commits
mailing list