deps: upgrade openssl sources to 1.0.2l · nodejs/node@77a9198 · GitHub
Skip to content

Commit 77a9198

Browse files
danbevMylesBorins
danbev
authored and
MylesBorins
committed
deps: upgrade openssl sources to 1.0.2l
This replaces all sources of openssl-1.0.2l.tar.gz into deps/openssl/openssl Fixes: #13161 PR-URL: #13233 Backport-PR-URL: #13695 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent 5b4c431 commit 77a9198

215 files changed

Lines changed: 1770 additions & 39189 deletions

File tree

Some content is hidden

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

‎deps/openssl/openssl/CHANGES‎

Lines changed: 6 additions & 0 deletions

‎deps/openssl/openssl/Configure‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
109109
# Minimum warning options... any contributions to OpenSSL should at least get
110110
# past these.
111111

112-
my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
112+
my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wundef -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
113113

114114
# TODO(openssl-team): fix problems and investigate if (at least) the following
115115
# warnings can also be enabled:
@@ -2041,12 +2041,13 @@ EOF
20412041
close(OUT);
20422042
} else {
20432043
my $make_command = "$make PERL=\'$perl\'";
2044-
my $make_targets = "";
2045-
$make_targets .= " links" if $symlink;
2046-
$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
2047-
$make_targets .= " gentests" if $symlink;
2048-
(system $make_command.$make_targets) == 0 or exit $?
2049-
if $make_targets ne "";
2044+
my @make_targets = ();
2045+
push @make_targets, "links" if $symlink;
2046+
push @make_targets, "depend" if $depflags ne $default_depflags && $make_depend;
2047+
push @make_targets, "gentests" if $symlink;
2048+
foreach my $make_target (@make_targets) {
2049+
(system "$make_command $make_target") == 0 or exit $?;
2050+
}
20502051
if ( $perl =~ m@^/@) {
20512052
&dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
20522053
&dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
@@ -2056,8 +2057,8 @@ EOF
20562057
&dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
20572058
}
20582059
if ($depflags ne $default_depflags && !$make_depend) {
2059-
$warn_make_depend++;
2060-
}
2060+
$warn_make_depend++;
2061+
}
20612062
}
20622063

20632064
# create the ms/version32.rc file if needed

‎deps/openssl/openssl/LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
LICENSE ISSUES
33
==============
44

5-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
5+
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
66
the OpenSSL License and the original SSLeay license apply to the toolkit.
77
See below for the actual license texts. Actually both licenses are BSD-style
88
Open Source licenses. In case of any license issues related to OpenSSL
@@ -12,7 +12,7 @@
1212
---------------
1313

1414
/* ====================================================================
15-
* Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
15+
* Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
1616
*
1717
* Redistribution and use in source and binary forms, with or without
1818
* modification, are permitted provided that the following conditions

‎deps/openssl/openssl/Makefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.2k
7+
VERSION=1.0.2l
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -426,6 +426,14 @@ clean: libclean
426426
rm -fr $$i/*; \
427427
done
428428

429+
distclean: clean
430+
-$(RM) `find . -name .git -prune -o -type l -print`
431+
$(RM) apps/CA.pl
432+
$(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem
433+
$(RM) tools/c_rehash
434+
$(RM) crypto/opensslconf.h
435+
$(RM) Makefile Makefile.bak
436+
429437
makefile.one: files
430438
$(PERL) util/mk1mf.pl >makefile.one; \
431439
sh util/do_ms.sh

‎deps/openssl/openssl/Makefile.bak‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.2k
7+
VERSION=1.0.2l
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -426,6 +426,14 @@ clean: libclean
426426
rm -fr $$i/*; \
427427
done
428428

429+
distclean: clean
430+
-$(RM) `find . -name .git -prune -o -type l -print`
431+
$(RM) apps/CA.pl
432+
$(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem
433+
$(RM) tools/c_rehash
434+
$(RM) crypto/opensslconf.h
435+
$(RM) Makefile Makefile.bak
436+
429437
makefile.one: files
430438
$(PERL) util/mk1mf.pl >makefile.one; \
431439
sh util/do_ms.sh

‎deps/openssl/openssl/Makefile.org‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,14 @@ clean: libclean
424424
rm -fr $$i/*; \
425425
done
426426

427+
distclean: clean
428+
-$(RM) `find . -name .git -prune -o -type l -print`
429+
$(RM) apps/CA.pl
430+
$(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem
431+
$(RM) tools/c_rehash
432+
$(RM) crypto/opensslconf.h
433+
$(RM) Makefile Makefile.bak
434+
427435
makefile.one: files
428436
$(PERL) util/mk1mf.pl >makefile.one; \
429437
sh util/do_ms.sh

‎deps/openssl/openssl/NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
This file gives a brief overview of the major changes between each OpenSSL
66
release. For more details please read the CHANGES file.
77

8+
Major changes between OpenSSL 1.0.2k and OpenSSL 1.0.2l [25 May 2017]
9+
10+
o config now recognises 64-bit mingw and chooses mingw64 instead of mingw
11+
812
Major changes between OpenSSL 1.0.2j and OpenSSL 1.0.2k [26 Jan 2017]
913

1014
o Truncated packet could crash via OOB read (CVE-2017-3731)

‎deps/openssl/openssl/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
OpenSSL 1.0.2k 26 Jan 2017
2+
OpenSSL 1.0.2l 25 May 2017
33

44
Copyright (c) 1998-2015 The OpenSSL Project
55
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

‎deps/openssl/openssl/apps/app_rand.c‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
124124
char buffer[200];
125125

126126
#ifdef OPENSSL_SYS_WINDOWS
127-
/*
128-
* allocate 2 to dont_warn not to use RAND_screen() via
129-
* -no_rand_screen option in s_client
130-
*/
131-
if (dont_warn != 2) {
132-
BIO_printf(bio_e, "Loading 'screen' into random state -");
133-
BIO_flush(bio_e);
134-
RAND_screen();
135-
BIO_printf(bio_e, " done\n");
136-
}
127+
RAND_screen();
137128
#endif
138129

139130
if (file == NULL)

‎deps/openssl/openssl/apps/ca.c‎

Lines changed: 11 additions & 8 deletions

0 commit comments

Comments
 (0)