Skip to content

[v10.x backport] Update openssl1.1.1a #26270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sam-github wants to merge 12 commits into from
Closed

[v10.x backport] Update openssl1.1.1a #26270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
be6a3a1
tls: add min/max protocol version options
sam-github May 6, 2018
8e4a622
doc: fix REPLACEME for tls min/max protocol option
sam-github Nov 30, 2018
39d09ce
deps: upgrade openssl sources to 1.1.1a
sam-github Dec 11, 2018
e8b39cf
deps: fix gyp/gypi for openssl-1.1.1
shigeki May 5, 2018
af05709
deps: fix MacOS and Win build for OpenSSL-1.1.1
shigeki Nov 1, 2018
08cf226
deps: add s390 asm rules for OpenSSL-1.1.1
shigeki Mar 7, 2018
0cf96fb
deps: add only avx2 configs for OpenSSL-1.1.1
shigeki Nov 8, 2018
87ff9f7
deps: fix for non GNU assembler in AIX
shigeki Nov 15, 2018
eb3470a
doc: fix assembler requirement for OpenSSL-1.1.1
shigeki Nov 10, 2018
312dcc3
deps: update archs files for OpenSSL-1.1.1a
sam-github Feb 23, 2019
6be596d
tls: workaround handshakedone in renegotiation
shigeki Sep 12, 2018
d502073
test: assert on client and server side seperately
sam-github Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: fix for non GNU assembler in AIX 
AIX has own assembler not GNU as that does not support --noexecstack.

PR-URL: #25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Backport-PR-URL: #25688
  • Loading branch information
@shigeki @sam-github
shigeki authored and sam-github committed Feb 28, 2019
commit 87ff9f746222a1a7ea2560dde8eecc5a8346694c
20 changes: 13 additions & 7 deletions deps/openssl/config/generate_gypi.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@
my $nasm_banner = `nasm -v`;
die "Error: nasm is not installed." if (!$nasm_banner);

my $nasm_version_min = 2.13.3;
my ($nasm_version) = ($nasm_banner =~/^NASM version ([0-9]\.[0-9][0-9])+/);
if ($nasm_version < $nasm_version_min) {
die "Error: nasm version $nasm_version is too old." .
"$nasm_version_min or higher is required.";
}

# gas version check
my $gas_version_min = 2.30;
my $gas_banner = `gcc -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`;
Expand Down Expand Up @@ -118,6 +111,17 @@
$target{'lib_cppflags'} =~ s/-D//g;
my @lib_cppflags = split(/ /, $target{'lib_cppflags'});

my @cflags = ();
push(@cflags, @{$config{'cflags'}});
push(@cflags, @{$config{'CFLAGS'}});
push(@cflags, $target{'cflags'});
push(@cflags, $target{'CFLAGS'});

# AIX has own assembler not GNU as that does not support --noexecstack
if ($arch =~ /aix/) {
@cflags = grep $_ ne '-Wa,--noexecstack', @cflags;
}

# Create openssl.gypi
my $template =
Text::Template->new(TYPE => 'FILE',
Expand All @@ -132,6 +136,7 @@
generated_srcs => \@generated_srcs,
config => \%config,
target => \%target,
cflags => \@cflags,
asm => \$asm,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
Expand All @@ -155,6 +160,7 @@
libapps_srcs => \@libapps_srcs,
config => \%config,
target => \%target,
cflags => \@cflags,
asm => \$asm,
arch => \$arch,
lib_cppflags => \@lib_cppflags,
Expand Down
10 changes: 2 additions & 8 deletions deps/openssl/config/openssl-cl.gypi.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@
$OUT .= " '$define',\n";
} -%% ],
'openssl_cflags_%%-$arch-%%': [
%%- foreach $cflag (@{$config{cflags}}) {
%%- foreach $cflag (@cflags) {
$OUT .= " '$cflag',\n";
}
foreach $cflag (@{$config{CFLAGS}}) {
$OUT .= " '$cflag',\n";
} -%%
'%%-$target{cflags}-%%',
'%%-$target{CFLAGS}-%%',
],
} -%% ],
'openssl_ex_libs_%%-$arch-%%': [
'%%-$target{ex_libs}-%%',
],
Expand Down
10 changes: 2 additions & 8 deletions deps/openssl/config/openssl.gypi.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,9 @@ foreach $src (@libcrypto_srcs) {
$OUT .= " '$define',\n";
} -%% ],
'openssl_cflags_%%-$arch-%%': [
%%- foreach $cflag (@{$config{cflags}}) {
%%- foreach $cflag (@cflags) {
$OUT .= " '$cflag',\n";
}
foreach $cflag (@{$config{CFLAGS}}) {
$OUT .= " '$cflag',\n";
} -%%
'%%-$target{cflags}-%%',
'%%-$target{CFLAGS}-%%',
],
} -%% ],
'openssl_ex_libs_%%-$arch-%%': [
'%%-$target{ex_libs}-%%',
],
Expand Down