[openssl] OpenSSL_1_1_1-stable update
Richard Levitte
levitte at openssl.org
Mon May 27 13:21:37 UTC 2019
The branch OpenSSL_1_1_1-stable has been updated
via 27a3be20a543fdd44517b898421f154e4619c78a (commit)
from 5a070488d8c7b31da9080e6fcce6aefdc86af608 (commit)
- Log -----------------------------------------------------------------
commit 27a3be20a543fdd44517b898421f154e4619c78a
Author: Richard Levitte <levitte at openssl.org>
Date: Mon May 27 14:40:25 2019 +0200
Configure: Remove extra warning and sanitizer options from CXXFLAGS
We add the extra warning and sanitizer options to check our code,
which is entirely in C. We support C++ compilers uniquely for the
sake of certain external test suites, and those projects can probably
sanitize their own code themselves.
[extended tests]
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9013)
(cherry picked from commit 3b437400d90fb89ce5e0d74fd79bda9028f185fb)
-----------------------------------------------------------------------
Summary of changes:
Configurations/90-team.norelease.conf | 6 +-
Configure | 105 ++++++++++++----------------------
2 files changed, 41 insertions(+), 70 deletions(-)
diff --git a/Configurations/90-team.norelease.conf b/Configurations/90-team.norelease.conf
index 45f1811..1d5d755 100644
--- a/Configurations/90-team.norelease.conf
+++ b/Configurations/90-team.norelease.conf
@@ -18,7 +18,7 @@ my %targets = (
"debug-erbridge" => {
inherit_from => [ 'BASE_unix', "x86_64_asm" ],
cc => "gcc",
- cflags => combine(join(' ', @{$gcc_devteam_warn{CFLAGS}}),
+ cflags => combine(join(' ', @gcc_devteam_warn),
"-DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g",
threads("-D_REENTRANT")),
ex_libs => add(" ","-ldl"),
@@ -83,7 +83,7 @@ my %targets = (
"debug-test-64-clang" => {
inherit_from => [ 'BASE_unix', "x86_64_asm" ],
cc => "clang",
- cflags => combine(join(' ', @{$gcc_devteam_warn{CFLAGS}}),
+ cflags => combine(join(' ', @gcc_devteam_warn),
"-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
threads("${BSDthreads}")),
bn_ops => "SIXTY_FOUR_BIT_LONG",
@@ -98,7 +98,7 @@ my %targets = (
inherit_from => [ 'BASE_unix', "x86_64_asm" ],
cc => "clang",
cflags => combine("-arch x86_64 -DL_ENDIAN",
- join(' ', @{$gcc_devteam_warn{CFLAGS}}),
+ join(' ', @gcc_devteam_warn),
"-Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
threads("${BSDthreads}")),
sys_id => "MACOSX",
diff --git a/Configure b/Configure
index 85418b3..f0892c2 100755
--- a/Configure
+++ b/Configure
@@ -101,8 +101,9 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx
# SHA512_ASM sha512_block is implemented in assembler
# AES_ASM AES_[en|de]crypt is implemented in assembler
-# Minimum warning options... any contributions to OpenSSL should at least get
-# past these.
+# Minimum warning options... any contributions to OpenSSL should at least
+# get past these. Note that we only use these with C compilers, not with
+# C++ compilers.
# DEBUG_UNUSED enables __owur (warn unused result) checks.
# -DPEDANTIC complements -pedantic and is meant to mask code that
@@ -117,27 +118,23 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx
# code, so we just tell compiler to be pedantic about everything
# but 'long long' type.
-my %gcc_devteam_warn = ();
-{
- my @common = qw( -DDEBUG_UNUSED
- -DPEDANTIC -pedantic -Wno-long-long
- -Wall
- -Wextra
- -Wno-unused-parameter
- -Wno-missing-field-initializers
- -Wswitch
- -Wsign-compare
- -Wshadow
- -Wformat
- -Wtype-limits
- -Wundef
- -Werror );
- %gcc_devteam_warn = (
- CFLAGS => [ @common, qw( -Wmissing-prototypes
- -Wstrict-prototypes ) ],
- CXXFLAGS => [ @common ]
- );
-}
+my @gcc_devteam_warn = qw(
+ -DDEBUG_UNUSED
+ -DPEDANTIC -pedantic -Wno-long-long
+ -Wall
+ -Wextra
+ -Wno-unused-parameter
+ -Wno-missing-field-initializers
+ -Wswitch
+ -Wsign-compare
+ -Wshadow
+ -Wformat
+ -Wtype-limits
+ -Wundef
+ -Werror
+ -Wmissing-prototypes
+ -Wstrict-prototypes
+);
# These are used in addition to $gcc_devteam_warn when the compiler is clang.
# TODO(openssl-team): fix problems and investigate if (at least) the
@@ -147,20 +144,16 @@ my %gcc_devteam_warn = ();
# -Wlanguage-extension-token -- no, we use asm()
# -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc
# -Wextended-offsetof -- no, needed in CMS ASN1 code
-my %clang_devteam_warn = ();
-{
- my @common = qw( -Wswitch-default
- -Wno-parentheses-equality
- -Wno-language-extension-token
- -Wno-extended-offsetof
- -Wconditional-uninitialized
- -Wincompatible-pointer-types-discards-qualifiers
- -Wno-unknown-warning-option );
- %clang_devteam_warn = (
- CFLAGS => [ @common, qw( -Wmissing-variable-declarations ) ],
- CXXFLAGS => [ @common ]
- );
-}
+my @clang_devteam_warn = qw(
+ -Wswitch-default
+ -Wno-parentheses-equality
+ -Wno-language-extension-token
+ -Wno-extended-offsetof
+ -Wconditional-uninitialized
+ -Wincompatible-pointer-types-discards-qualifiers
+ -Wno-unknown-warning-option
+ -Wmissing-variable-declarations
+);
# This adds backtrace information to the memory leak info. Is only used
# when crypto-mdebug-backtrace is enabled.
@@ -758,7 +751,6 @@ while (@argvcopy)
# Pretend that our strict flags is a C flag, and replace it
# with the proper flags later on
push @{$useradd{CFLAGS}}, '--ossl-strict-warnings';
- push @{$useradd{CXXFLAGS}}, '--ossl-strict-warnings';
$strict_warnings=1;
}
elsif (/^--debug$/)
@@ -1306,20 +1298,16 @@ if ($disabled{"dynamic-engine"}) {
unless ($disabled{asan}) {
push @{$config{cflags}}, "-fsanitize=address";
- push @{$config{cxxflags}}, "-fsanitize=address" if $config{CXX};
}
unless ($disabled{ubsan}) {
# -DPEDANTIC or -fnosanitize=alignment may also be required on some
# platforms.
push @{$config{cflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all";
- push @{$config{cxxflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all"
- if $config{CXX};
}
unless ($disabled{msan}) {
push @{$config{cflags}}, "-fsanitize=memory";
- push @{$config{cxxflags}}, "-fsanitize=memory" if $config{CXX};
}
unless ($disabled{"fuzz-libfuzzer"} && $disabled{"fuzz-afl"}
@@ -1508,41 +1496,27 @@ if (defined($config{api})) {
push @{$config{defines}}, $apiflag;
}
-my %strict_warnings_collection=( CFLAGS => [], CXXFLAGS => []);
+my @strict_warnings_collection=();
if ($strict_warnings)
{
my $wopt;
my $gccver = $predefined_C{__GNUC__} // -1;
- my $gxxver = $predefined_CXX{__GNUC__} // -1;
warn "WARNING --strict-warnings requires gcc[>=4] or gcc-alike"
unless $gccver >= 4;
- warn "WARNING --strict-warnings requires g++[>=4] or g++-alike"
- unless $gxxver >= 4;
- foreach (qw(CFLAGS CXXFLAGS))
- {
- push @{$strict_warnings_collection{$_}},
- @{$gcc_devteam_warn{$_}};
- }
- push @{$strict_warnings_collection{CFLAGS}},
- @{$clang_devteam_warn{CFLAGS}}
- if (defined($predefined_C{__clang__}));
- push @{$strict_warnings_collection{CXXFLAGS}},
- @{$clang_devteam_warn{CXXFLAGS}}
- if (defined($predefined_CXX{__clang__}));
+ push @strict_warnings_collection, @gcc_devteam_warn;
+ push @strict_warnings_collection, @clang_devteam_warn
+ if (defined($predefined_C{__clang__}));
}
if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
disable('static', 'pic', 'threads');
}
-foreach my $idx (qw(CFLAGS CXXFLAGS))
- {
- $config{$idx} = [ map { $_ eq '--ossl-strict-warnings'
- ? @{$strict_warnings_collection{$idx}}
- : ( $_ ) }
- @{$config{$idx}} ];
- }
+$config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
+ ? @strict_warnings_collection
+ : ( $_ ) }
+ @{$config{CFLAGS}} ];
unless ($disabled{"crypto-mdebug-backtrace"})
{
@@ -1550,9 +1524,6 @@ unless ($disabled{"crypto-mdebug-backtrace"})
{
push @{$config{cflags}}, $wopt
unless grep { $_ eq $wopt } @{$config{cflags}};
- push @{$config{cxxflags}}, $wopt
- if ($config{CXX}
- && !grep { $_ eq $wopt } @{$config{cxxflags}});
}
if ($target =~ /^BSD-/)
{
More information about the openssl-commits
mailing list