[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Mon May 2 18:19:48 UTC 2016
The branch master has been updated
via afce395cba521e395e6eecdaf9589105f61e4411 (commit)
via 38add2300f5f6ef9c46eabc13537eaf50c51131d (commit)
via b5293d4c8dde9f71df27723071869ac8b62a0649 (commit)
via 85e2fe81136087961ef1b6a40058d3916db08d70 (commit)
from e8408681b3fff91b794a1a5c65fd190019d6e9ee (commit)
- Log -----------------------------------------------------------------
commit afce395cba521e395e6eecdaf9589105f61e4411
Author: Richard Levitte <levitte at openssl.org>
Date: Mon May 2 20:00:12 2016 +0200
Document the addition of OPENSSL_LOCAL_CONFIG_DIR
Reviewed-by: Stephen Henson <steve at openssl.org>
commit 38add2300f5f6ef9c46eabc13537eaf50c51131d
Author: Richard Levitte <levitte at openssl.org>
Date: Mon May 2 17:05:48 2016 +0200
Add the possibility for local build file templates
Use the environment variable OPENSSL_LOCAL_CONFIG_DIR to find build
file templates as well.
Reviewed-by: Stephen Henson <steve at openssl.org>
commit b5293d4c8dde9f71df27723071869ac8b62a0649
Author: Richard Levitte <levitte at openssl.org>
Date: Mon May 2 16:50:51 2016 +0200
Add the possibility to have an extra local OpenSSL configs directory
The environment variable OPENSSL_LOCAL_CONFIG_DIR is used to indicate
that there's a local directory with extra configuration files.
Reviewed-by: Stephen Henson <steve at openssl.org>
commit 85e2fe81136087961ef1b6a40058d3916db08d70
Author: Richard Levitte <levitte at openssl.org>
Date: Mon May 2 16:02:04 2016 +0200
Remove personal configs from version control
As per a team decision back in 2014.
Reviewed-by: Stephen Henson <steve at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 7 +++
Configurations/99-personal-ben.conf | 95 ---------------------------------
Configurations/99-personal-bodo.conf | 21 --------
Configurations/99-personal-geoff.conf | 29 ----------
Configurations/99-personal-levitte.conf | 21 --------
Configurations/99-personal-rse.conf | 12 -----
Configurations/99-personal-steve.conf | 50 -----------------
Configure | 43 ++++++++++++---
8 files changed, 44 insertions(+), 234 deletions(-)
delete mode 100644 Configurations/99-personal-ben.conf
delete mode 100644 Configurations/99-personal-bodo.conf
delete mode 100644 Configurations/99-personal-geoff.conf
delete mode 100644 Configurations/99-personal-levitte.conf
delete mode 100644 Configurations/99-personal-rse.conf
delete mode 100644 Configurations/99-personal-steve.conf
diff --git a/CHANGES b/CHANGES
index 477d185..41bc9a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,13 @@
Changes between 1.0.2g and 1.1.0 [xx XXX xxxx]
+ *) To enable users to have their own config files and build file templates,
+ Configure looks in the directory indicated by the environment variable
+ OPENSSL_LOCAL_CONFIG_DIR as well as the in-source Configurations/
+ directory. On VMS, OPENSSL_LOCAL_CONFIG_DIR is expected to be a logical
+ name and is used as is.
+ [Richard Levitte]
+
*) The following datatypes were made opaque: X509_OBJECT, X509_STORE_CTX,
X509_STORE, X509_LOOKUP, and X509_LOOKUP_METHOD. The unused type
X509_CERT_FILE_CTX was removed.
diff --git a/Configurations/99-personal-ben.conf b/Configurations/99-personal-ben.conf
deleted file mode 100644
index 50b9315..0000000
--- a/Configurations/99-personal-ben.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "debug-ben" => {
- cc => "gcc",
- cflags => "$gcc_devteam_warn -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -O2 -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-openbsd" => {
- cc => "gcc",
- cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-openbsd-debug" => {
- cc => "gcc",
- cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-debug" => {
- cc => "gcc",
- cflags => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-debug-64" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
- threads("${BSDthreads}")),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "bsd-gcc-shared",
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-ben-debug-64-clang" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "clang",
- cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
- threads("${BSDthreads}")),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "bsd-gcc-shared",
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-ben-debug-64-noopt" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",
- threads("${BSDthreads}")),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "bsd-gcc-shared",
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-ben-macos" => {
- cc => "cc",
- cflags => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-no-opt" => {
- cc => "gcc",
- cflags => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -Werror -DL_ENDIAN -Wall -g3",
- thread_scheme => "(unknown)",
- },
- "debug-ben-strict" => {
- cc => "gcc",
- cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",
- thread_scheme => "(unknown)",
- },
- "debug-ben-darwin64" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "cc",
- cflags => combine("$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall",
- threads("-D_REENTRANT")),
- sys_id => "MACOSX",
- plib_lflags => "-Wl,-search_paths_first",
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "macosx",
- dso_scheme => "dlfcn",
- shared_target => "darwin-shared",
- shared_cflag => "-fPIC -fno-common",
- shared_ldflag => "-arch x86_64 -dynamiclib",
- shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- },
-);
diff --git a/Configurations/99-personal-bodo.conf b/Configurations/99-personal-bodo.conf
deleted file mode 100644
index df9b49c..0000000
--- a/Configurations/99-personal-bodo.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "debug-bodo" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
- threads("-D_REENTRANT")),
- ex_libs => add(" ","-ldl"),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_ldflag => "-m64",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- multilib => "64",
- },
-);
diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf
deleted file mode 100644
index 5bddfae..0000000
--- a/Configurations/99-personal-geoff.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "debug-geoff32" => {
- cc => "gcc",
- cflags => combine("-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
- threads("-D_REENTRANT")),
- ex_libs => add(" ","-ldl"),
- bn_ops => "BN_LLONG",
- thread_scheme => "pthreads",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-geoff64" => {
- cc => "gcc",
- cflags => combine("-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
- threads("-D_REENTRANT")),
- ex_libs => add(" ","-ldl"),
- bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
- thread_scheme => "pthreads",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
-);
diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf
deleted file mode 100644
index c67252b..0000000
--- a/Configurations/99-personal-levitte.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "levitte-linux-elf" => {
- inherit_from => [ "linux-elf" ],
- cflags => add(picker(debug => "-ggdb -g3")),
- defines => add(picker(debug => "LEVITTE_DEBUG"),
- { separator => undef }),
- build_scheme => [ "unified", "unix" ],
- build_file => "Makefile",
- },
- "levitte-linux-x86_64" => {
- inherit_from => [ "linux-x86_64" ],
- cflags => add(picker(debug => "-ggdb -g3")),
- defines => add(picker(debug => "LEVITTE_DEBUG"),
- { separator => undef }),
- build_scheme => [ "unified", "unix" ],
- build_file => "Makefile",
- },
-);
diff --git a/Configurations/99-personal-rse.conf b/Configurations/99-personal-rse.conf
deleted file mode 100644
index 9999fcd..0000000
--- a/Configurations/99-personal-rse.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "debug-rse" => {
- inherit_from => [ "x86_elf_asm" ],
- cc => "cc",
- cflags => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall",
- thread_scheme => "(unknown)",
- bn_ops => "BN_LLONG",
- },
-);
diff --git a/Configurations/99-personal-steve.conf b/Configurations/99-personal-steve.conf
deleted file mode 100644
index 473fd24..0000000
--- a/Configurations/99-personal-steve.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-## -*- mode: perl; -*-
-## Personal configuration targets
-
-%targets = (
- "debug-steve64" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -pthread -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g",
- threads("-D_REENTRANT")),
- ex_libs => add(" ","-ldl"),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_ldflag => "-m64",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-steve32" => {
- inherit_from => [ "x86_elf_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -pthread -m32 -DL_ENDIAN -DCONF_DEBUG -g",
- threads("-D_REENTRANT")),
- lflags => "-rdynamic",
- ex_libs => add(" ","-ldl"),
- bn_ops => "BN_LLONG",
- thread_scheme => "pthreads",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_ldflag => "-m32",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "debug-steve-opt" => {
- inherit_from => [ "x86_64_asm" ],
- cc => "gcc",
- cflags => combine("$gcc_devteam_warn -pthread -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g",
- threads("-D_REENTRANT")),
- ex_libs => add(" ","-ldl"),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- thread_scheme => "pthreads",
- perlasm_scheme => "elf",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
- shared_ldflag => "-m64",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
-);
diff --git a/Configure b/Configure
index 90103bb..f2909ce 100755
--- a/Configure
+++ b/Configure
@@ -178,6 +178,8 @@ my $srcdir = catdir(absolutedir(dirname($0))); # catdir ensures local syntax
my $blddir = catdir(absolutedir(".")); # catdir ensures local syntax
my $dofile = abs2rel(catfile($srcdir, "util/dofile.pl"));
+my $local_config_envname = 'OPENSSL_LOCAL_CONFIG_DIR';
+
$config{sourcedir} = abs2rel($srcdir);
$config{builddir} = abs2rel($blddir);
@@ -212,6 +214,20 @@ foreach (sort glob($pattern) ) {
&read_config($_);
}
+if (defined $ENV{$local_config_envname}) {
+ if ($^O eq 'VMS') {
+ # VMS environment variables are logical names,
+ # which can be used as is
+ $pattern = $local_config_envname . ':' . '*.conf';
+ } else {
+ $pattern = catfile($ENV{$local_config_envname}, '*.conf');
+ }
+
+ foreach (sort glob($pattern) ) {
+ &read_config($_);
+ }
+}
+
print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
@@ -1222,12 +1238,27 @@ my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO});
if ($builder eq "unified") {
# Store the name of the template file we will build the build file from
# in %config. This may be useful for the build file itself.
- my $build_file_template =
- catfile($srcdir, "Configurations",
- $builder_platform."-".$target{build_file}.".tmpl");
- $build_file_template =
- catfile($srcdir, "Configurations", $target{build_file}.".tmpl")
- if (! -f $build_file_template);
+ my $build_file_template;
+
+ for my $filename (( $builder_platform."-".$target{build_file}.".tmpl",
+ $target{build_file}.".tmpl" )) {
+ if (defined $ENV{$local_config_envname}) {
+ if ($^O eq 'VMS') {
+ # VMS environment variables are logical names,
+ # which can be used as is
+ $build_file_template = $local_config_envname . ':' . $filename;
+ } else {
+ $build_file_template = catfile($ENV{$local_config_envname},
+ $filename);
+ }
+ }
+
+ last if -f $build_file_template;
+
+ $build_file_template = catfile($srcdir, "Configurations", $filename);
+
+ last if -f $build_file_template;
+ }
$config{build_file_template} = $build_file_template;
use lib catdir(dirname(__FILE__),"util");
More information about the openssl-commits
mailing list