deps: upgrade openssl sources to 1.0.2n · nodejs/node@b3afedf · GitHub
Skip to content

Commit b3afedf

Browse files
shigekiMylesBorins
shigeki
authored and
MylesBorins
committed
deps: upgrade openssl sources to 1.0.2n
This replaces all sources of openssl-1.0.2n.tar.gz into deps/openssl/openssl PR-URL: #17526 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent a7c4fab commit b3afedf

118 files changed

Lines changed: 592 additions & 38647 deletions

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: 45 additions & 0 deletions

‎deps/openssl/openssl/Configure‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,9 @@ my %table=(
592592
"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
593593
# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
594594
# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
595-
"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
595+
"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
596596
# Unified CE target
597-
"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
597+
"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
598598
"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
599599

600600
# Borland C++ 4.5

‎deps/openssl/openssl/Makefile‎

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

7-
VERSION=1.0.2m
7+
VERSION=1.0.2n
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0

‎deps/openssl/openssl/Makefile.bak‎

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

7-
VERSION=1.0.2m
7+
VERSION=1.0.2n
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0

‎deps/openssl/openssl/NEWS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
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.2m and OpenSSL 1.0.2n [7 Dec 2017]
9+
10+
o Read/write after SSL object in error state (CVE-2017-3737)
11+
o rsaz_1024_mul_avx2 overflow bug on x86_64 (CVE-2017-3738)
12+
813
Major changes between OpenSSL 1.0.2l and OpenSSL 1.0.2m [2 Nov 2017]
914

1015
o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736)

‎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.2m 2 Nov 2017
2+
OpenSSL 1.0.2n 7 Dec 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/apps.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@
148148
#ifdef _WIN32
149149
static int WIN32_rename(const char *from, const char *to);
150150
# define rename(from,to) WIN32_rename((from),(to))
151+
# ifdef fileno
152+
# undef fileno
153+
# endif
154+
# define fileno(a) (int)_fileno(a)
151155
#endif
152156

153157
typedef struct {
@@ -2788,13 +2792,13 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
27882792
OPENSSL_free(out);
27892793
return NULL;
27902794
}
2791-
out[start] = i - start;
2795+
out[start] = (unsigned char)(i - start);
27922796
start = i + 1;
27932797
} else
27942798
out[i + 1] = in[i];
27952799
}
27962800

2797-
*outlen = len + 1;
2801+
*outlen = (unsigned char)(len + 1);
27982802
return out;
27992803
}
28002804
#endif /* ndef OPENSSL_NO_TLSEXT */

‎deps/openssl/openssl/apps/dsa.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ int MAIN(int argc, char **argv)
327327
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
328328
EVP_PKEY *pk;
329329
pk = EVP_PKEY_new();
330+
if (pk == NULL)
331+
goto end;
332+
330333
EVP_PKEY_set1_DSA(pk, dsa);
331334
if (outformat == FORMAT_PVK)
332335
i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);

‎deps/openssl/openssl/apps/s_client.c‎

Lines changed: 13 additions & 27 deletions

0 commit comments

Comments
 (0)