Skip to content

Commit 0cd883f

Browse files
shigekiMylesBorins
authored andcommittedMar 28, 2018
deps: upgrade openssl sources to 1.0.2o
This replaces all sources of openssl-1.0.2o.tar.gz into deps/openssl/openssl PR-URL: #19638 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent c39167d commit 0cd883f

File tree

250 files changed

+1387
-39509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+1387
-39509
lines changed
 

‎deps/openssl/openssl/CHANGES

+20-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@
77
https://github.com/openssl/openssl/commits/ and pick the appropriate
88
release branch.
99

10+
Changes between 1.0.2n and 1.0.2o [27 Mar 2018]
11+
12+
*) Constructed ASN.1 types with a recursive definition could exceed the stack
13+
14+
Constructed ASN.1 types with a recursive definition (such as can be found
15+
in PKCS7) could eventually exceed the stack given malicious input with
16+
excessive recursion. This could result in a Denial Of Service attack. There
17+
are no such structures used within SSL/TLS that come from untrusted sources
18+
so this is considered safe.
19+
20+
This issue was reported to OpenSSL on 4th January 2018 by the OSS-fuzz
21+
project.
22+
(CVE-2018-0739)
23+
[Matt Caswell]
24+
1025
Changes between 1.0.2m and 1.0.2n [7 Dec 2017]
1126

1227
*) Read/write after SSL object in error state
@@ -2012,8 +2027,11 @@
20122027
to work with OPENSSL_NO_SSL_INTERN defined.
20132028
[Steve Henson]
20142029

2015-
*) Add SRP support.
2016-
[Tom Wu <tjw@cs.stanford.edu> and Ben Laurie]
2030+
*) A long standing patch to add support for SRP from EdelWeb (Peter
2031+
Sylvester and Christophe Renou) was integrated.
2032+
[Christophe Renou <christophe.renou@edelweb.fr>, Peter Sylvester
2033+
<peter.sylvester@edelweb.fr>, Tom Wu <tjw@cs.stanford.edu>, and
2034+
Ben Laurie]
20172035

20182036
*) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
20192037
[Steve Henson]

‎deps/openssl/openssl/Configure

+15-9
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ my %table=(
354354
"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::-Wl,+s -ldld:DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
355355

356356
#### HP MPE/iX http://jazz.external.hp.com/src/openssl/
357-
"MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
357+
"MPE/iX-gcc", "gcc:-DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
358358

359359
# DEC Alpha OSF/1/Tru64 targets.
360360
#
@@ -1269,7 +1269,7 @@ my ($prelflags,$postlflags)=split('%',$lflags);
12691269
if (defined($postlflags)) { $lflags=$postlflags; }
12701270
else { $lflags=$prelflags; undef $prelflags; }
12711271

1272-
if ($target =~ /^mingw/ && `$cc --target-help 2>&1` !~ m/\-mno\-cygwin/m)
1272+
if ($target =~ /^mingw/ && `$cross_compile_prefix$cc --target-help 2>&1` !~ m/\-mno\-cygwin/m)
12731273
{
12741274
$cflags =~ s/\-mno\-cygwin\s*//;
12751275
$shared_ldflag =~ s/\-mno\-cygwin\s*//;
@@ -1661,18 +1661,25 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
16611661
$shlib_minor=$2;
16621662
}
16631663

1664-
my $ecc = $cc;
1665-
$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
1664+
my %predefined;
1665+
1666+
# collect compiler pre-defines from gcc or gcc-alike...
1667+
open(PIPE, "$cross_compile_prefix$cc -dM -E -x c /dev/null 2>&1 |");
1668+
while (<PIPE>) {
1669+
m/^#define\s+(\w+(?:\(\w+\))?)(?:\s+(.+))?/ or last;
1670+
$predefined{$1} = defined($2) ? $2 : "";
1671+
}
1672+
close(PIPE);
16661673

16671674
if ($strict_warnings)
16681675
{
16691676
my $wopt;
1670-
die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);
1677+
die "ERROR --strict-warnings requires gcc or clang" unless defined($predefined{__GNUC__});
16711678
foreach $wopt (split /\s+/, $gcc_devteam_warn)
16721679
{
16731680
$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
16741681
}
1675-
if ($ecc eq "clang")
1682+
if (defined($predefined{__clang__}))
16761683
{
16771684
foreach $wopt (split /\s+/, $clang_devteam_warn)
16781685
{
@@ -1723,15 +1730,14 @@ while (<IN>)
17231730
s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
17241731
s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
17251732
s/^RC=\s*/RC= \$\(CROSS_COMPILE\)/;
1726-
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
1733+
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $predefined{__GNUC__} >= 3;
17271734
}
17281735
else {
17291736
s/^CC=.*$/CC= $cc/;
17301737
s/^AR=\s*ar/AR= $ar/;
17311738
s/^RANLIB=.*/RANLIB= $ranlib/;
17321739
s/^RC=.*/RC= $windres/;
1733-
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
1734-
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
1740+
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $predefined{__GNUC__} >= 3;
17351741
}
17361742
s/^CFLAG=.*$/CFLAG= $cflags/;
17371743
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;

0 commit comments

Comments
 (0)
Please sign in to comment.