Skip to content

Commit 20ff1e2

Browse files
Shigeki OhtsuFishrock123
Shigeki Ohtsu
authored and
Fishrock123
committed
deps: upgrade openssl sources to 1.0.2d
This just replaces all sources of openssl-1.0.2d.tar.gz into deps/openssl/openssl deps: copy all openssl header files to include dir All symlink files in `deps/openssl/openssl/include/openssl/` are removed and replaced with real header files to avoid issues on Windows. deps: fix openssl assembly error on ia32 win32 `x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp> deps: fix asm build error of openssl in x86_win32 See https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html iojs needs to stop using masm and move to nasm or yasm on Win32. Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> openssl: fix keypress requirement in apps on win32 Reapply b910613 . Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> deps: add -no_rand_screen to openssl s_client In openssl s_client on Windows, RAND_screen() is invoked to initialize random state but it takes several seconds in each connection. This added -no_rand_screen to openssl s_client on Windows to skip RAND_screen() and gets a better performance in the unit test of test-tls-server-verify. Do not enable this except to use in the unit test. Fixes: nodejs#1461 PR-URL: nodejs#1836 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> PR-URL: nodejs#2141 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 03c105a commit 20ff1e2

Some content is hidden

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

54 files changed

+965
-270
lines changed

‎deps/openssl/openssl/CHANGES‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.2c and 1.0.2d [9 Jul 2015]
6+
7+
*) Alternate chains certificate forgery
8+
9+
During certificate verfification, OpenSSL will attempt to find an
10+
alternative certificate chain if the first attempt to build such a chain
11+
fails. An error in the implementation of this logic can mean that an
12+
attacker could cause certain checks on untrusted certificates to be
13+
bypassed, such as the CA flag, enabling them to use a valid leaf
14+
certificate to act as a CA and "issue" an invalid certificate.
15+
16+
This issue was reported to OpenSSL by Adam Langley/David Benjamin
17+
(Google/BoringSSL).
18+
[Matt Caswell]
19+
520
Changes between 1.0.2b and 1.0.2c [12 Jun 2015]
621

722
*) Fix HMAC ABI incompatibility. The previous version introduced an ABI

‎deps/openssl/openssl/Makefile‎

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

7-
VERSION=1.0.2c
7+
VERSION=1.0.2d
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -271,6 +271,7 @@ reflect:
271271
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
272272

273273
sub_all: build_all
274+
274275
build_all: build_libs build_apps build_tests build_tools
275276

276277
build_libs: build_libcrypto build_libssl openssl.pc
@@ -280,15 +281,15 @@ build_libssl: build_ssl libssl.pc
280281

281282
build_crypto:
282283
@dir=crypto; target=all; $(BUILD_ONE_CMD)
283-
build_ssl:
284+
build_ssl: build_crypto
284285
@dir=ssl; target=all; $(BUILD_ONE_CMD)
285-
build_engines:
286+
build_engines: build_crypto
286287
@dir=engines; target=all; $(BUILD_ONE_CMD)
287-
build_apps:
288+
build_apps: build_libs
288289
@dir=apps; target=all; $(BUILD_ONE_CMD)
289-
build_tests:
290+
build_tests: build_libs
290291
@dir=test; target=all; $(BUILD_ONE_CMD)
291-
build_tools:
292+
build_tools: build_libs
292293
@dir=tools; target=all; $(BUILD_ONE_CMD)
293294

294295
all_testapps: build_libs build_testapps

‎deps/openssl/openssl/Makefile.bak‎

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

7-
VERSION=1.0.2c-dev
7+
VERSION=1.0.2d-dev
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -271,6 +271,7 @@ reflect:
271271
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
272272

273273
sub_all: build_all
274+
274275
build_all: build_libs build_apps build_tests build_tools
275276

276277
build_libs: build_libcrypto build_libssl openssl.pc
@@ -280,15 +281,15 @@ build_libssl: build_ssl libssl.pc
280281

281282
build_crypto:
282283
@dir=crypto; target=all; $(BUILD_ONE_CMD)
283-
build_ssl:
284+
build_ssl: build_crypto
284285
@dir=ssl; target=all; $(BUILD_ONE_CMD)
285-
build_engines:
286+
build_engines: build_crypto
286287
@dir=engines; target=all; $(BUILD_ONE_CMD)
287-
build_apps:
288+
build_apps: build_libs
288289
@dir=apps; target=all; $(BUILD_ONE_CMD)
289-
build_tests:
290+
build_tests: build_libs
290291
@dir=test; target=all; $(BUILD_ONE_CMD)
291-
build_tools:
292+
build_tools: build_libs
292293
@dir=tools; target=all; $(BUILD_ONE_CMD)
293294

294295
all_testapps: build_libs build_testapps

‎deps/openssl/openssl/Makefile.org‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ reflect:
269269
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
270270

271271
sub_all: build_all
272+
272273
build_all: build_libs build_apps build_tests build_tools
273274

274275
build_libs: build_libcrypto build_libssl openssl.pc
@@ -278,15 +279,15 @@ build_libssl: build_ssl libssl.pc
278279

279280
build_crypto:
280281
@dir=crypto; target=all; $(BUILD_ONE_CMD)
281-
build_ssl:
282+
build_ssl: build_crypto
282283
@dir=ssl; target=all; $(BUILD_ONE_CMD)
283-
build_engines:
284+
build_engines: build_crypto
284285
@dir=engines; target=all; $(BUILD_ONE_CMD)
285-
build_apps:
286+
build_apps: build_libs
286287
@dir=apps; target=all; $(BUILD_ONE_CMD)
287-
build_tests:
288+
build_tests: build_libs
288289
@dir=test; target=all; $(BUILD_ONE_CMD)
289-
build_tools:
290+
build_tools: build_libs
290291
@dir=tools; target=all; $(BUILD_ONE_CMD)
291292

292293
all_testapps: build_libs build_testapps

‎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.2c and OpenSSL 1.0.2d [9 Jul 2015]
9+
10+
o Alternate chains certificate forgery (CVE-2015-1793)
11+
812
Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
913

1014
o Fix HMAC ABI incompatibility

‎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.2c 12 Jun 2015
2+
OpenSSL 1.0.2d 9 Jul 2015
33

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

‎deps/openssl/openssl/apps/ocsp.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ int MAIN(int argc, char **argv)
209209
OPENSSL_free(tport);
210210
if (tpath)
211211
OPENSSL_free(tpath);
212+
thost = tport = tpath = NULL;
212213
if (args[1]) {
213214
args++;
214215
if (!OCSP_parse_url(*args, &host, &port, &path, &use_ssl)) {

‎deps/openssl/openssl/crypto/bio/bio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void BIO_clear_flags(BIO *b, int flags);
291291
* BIO_CB_RETURN flag indicates if it is after the call
292292
*/
293293
# define BIO_CB_RETURN 0x80
294-
# define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
294+
# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
295295
# define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
296296
# define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
297297

‎deps/openssl/openssl/crypto/bn/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
253253
bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
254254
bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
255255
bn_exp.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_exp.c bn_lcl.h
256+
bn_exp.o: rsaz_exp.h
256257
bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
257258
bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
258259
bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

‎deps/openssl/openssl/crypto/bn/bn_exp.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,7 @@
126126
# include <alloca.h>
127127
#endif
128128

129-
#undef RSAZ_ENABLED
130-
#if defined(OPENSSL_BN_ASM_MONT) && \
131-
(defined(__x86_64) || defined(__x86_64__) || \
132-
defined(_M_AMD64) || defined(_M_X64))
133-
# include "rsaz_exp.h"
134-
# define RSAZ_ENABLED
135-
#endif
129+
#include "rsaz_exp.h"
136130

137131
#undef SPARC_T4_MONT
138132
#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc))

0 commit comments

Comments
 (0)