Skip to content

Commit 0cf9f27

Browse files
Shigeki OhtsuJulien Gilli
Shigeki Ohtsu
authored and
Julien Gilli
committed
deps: upgrade openssl sources to 1.0.1p
This just replaces all sources of openssl-1.0.1p.tar.gz into deps/openssl/openssl. PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <[email protected]>
1 parent 18d413d commit 0cf9f27

File tree

118 files changed

+1213
-792
lines changed

Some content is hidden

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

118 files changed

+1213
-792
lines changed

‎deps/openssl/openssl/CHANGES

+15
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.1o and 1.0.1p [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.1n and 1.0.1o [12 Jun 2015]
621

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

‎deps/openssl/openssl/Makefile

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.1o
7+
VERSION=1.0.1p
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -270,6 +270,7 @@ reflect:
270270
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
271271

272272
sub_all: build_all
273+
273274
build_all: build_libs build_apps build_tests build_tools
274275

275276
build_libs: build_libcrypto build_libssl openssl.pc
@@ -279,15 +280,15 @@ build_libssl: build_ssl libssl.pc
279280

280281
build_crypto:
281282
@dir=crypto; target=all; $(BUILD_ONE_CMD)
282-
build_ssl:
283+
build_ssl: build_crypto
283284
@dir=ssl; target=all; $(BUILD_ONE_CMD)
284-
build_engines:
285+
build_engines: build_crypto
285286
@dir=engines; target=all; $(BUILD_ONE_CMD)
286-
build_apps:
287+
build_apps: build_libs
287288
@dir=apps; target=all; $(BUILD_ONE_CMD)
288-
build_tests:
289+
build_tests: build_libs
289290
@dir=test; target=all; $(BUILD_ONE_CMD)
290-
build_tools:
291+
build_tools: build_libs
291292
@dir=tools; target=all; $(BUILD_ONE_CMD)
292293

293294
all_testapps: build_libs build_testapps

‎deps/openssl/openssl/Makefile.bak

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.1o-dev
7+
VERSION=1.0.1p-dev
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -270,6 +270,7 @@ reflect:
270270
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
271271

272272
sub_all: build_all
273+
273274
build_all: build_libs build_apps build_tests build_tools
274275

275276
build_libs: build_libcrypto build_libssl openssl.pc
@@ -279,15 +280,15 @@ build_libssl: build_ssl libssl.pc
279280

280281
build_crypto:
281282
@dir=crypto; target=all; $(BUILD_ONE_CMD)
282-
build_ssl:
283+
build_ssl: build_crypto
283284
@dir=ssl; target=all; $(BUILD_ONE_CMD)
284-
build_engines:
285+
build_engines: build_crypto
285286
@dir=engines; target=all; $(BUILD_ONE_CMD)
286-
build_apps:
287+
build_apps: build_libs
287288
@dir=apps; target=all; $(BUILD_ONE_CMD)
288-
build_tests:
289+
build_tests: build_libs
289290
@dir=test; target=all; $(BUILD_ONE_CMD)
290-
build_tools:
291+
build_tools: build_libs
291292
@dir=tools; target=all; $(BUILD_ONE_CMD)
292293

293294
all_testapps: build_libs build_testapps

‎deps/openssl/openssl/Makefile.org

+6-5
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ reflect:
268268
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
269269

270270
sub_all: build_all
271+
271272
build_all: build_libs build_apps build_tests build_tools
272273

273274
build_libs: build_libcrypto build_libssl openssl.pc
@@ -277,15 +278,15 @@ build_libssl: build_ssl libssl.pc
277278

278279
build_crypto:
279280
@dir=crypto; target=all; $(BUILD_ONE_CMD)
280-
build_ssl:
281+
build_ssl: build_crypto
281282
@dir=ssl; target=all; $(BUILD_ONE_CMD)
282-
build_engines:
283+
build_engines: build_crypto
283284
@dir=engines; target=all; $(BUILD_ONE_CMD)
284-
build_apps:
285+
build_apps: build_libs
285286
@dir=apps; target=all; $(BUILD_ONE_CMD)
286-
build_tests:
287+
build_tests: build_libs
287288
@dir=test; target=all; $(BUILD_ONE_CMD)
288-
build_tools:
289+
build_tools: build_libs
289290
@dir=tools; target=all; $(BUILD_ONE_CMD)
290291

291292
all_testapps: build_libs build_testapps

‎deps/openssl/openssl/NEWS

+4
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.1o and OpenSSL 1.0.1p [9 Jul 2015]
9+
10+
o Alternate chains certificate forgery (CVE-2015-1793)
11+
812
Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015]
913

1014
o Fix HMAC ABI incompatibility

‎deps/openssl/openssl/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
OpenSSL 1.0.1o 12 Jun 2015
2+
OpenSSL 1.0.1p 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/s_client.c

+7-13
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@ typedef unsigned int u_int;
180180
# include <fcntl.h>
181181
#endif
182182

183-
/* Use Windows API with STD_INPUT_HANDLE when checking for input?
184-
Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if
185-
OPENSSL_SYS_WINDOWS is defined */
186-
#if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE)
187-
#define OPENSSL_USE_STD_INPUT_HANDLE
188-
#endif
189-
190183
#undef PROG
191184
#define PROG s_client_main
192185

@@ -1591,16 +1584,17 @@ int MAIN(int argc, char **argv)
15911584
tv.tv_usec = 0;
15921585
i = select(width, (void *)&readfds, (void *)&writefds,
15931586
NULL, &tv);
1594-
#if defined(OPENSSL_USE_STD_INPUT_HANDLE)
1587+
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
1588+
if (!i && (!_kbhit() || !read_tty))
1589+
continue;
1590+
# else
15951591
if (!i && (!((_kbhit())
15961592
|| (WAIT_OBJECT_0 ==
15971593
WaitForSingleObject(GetStdHandle
15981594
(STD_INPUT_HANDLE),
15991595
0)))
16001596
|| !read_tty))
16011597
continue;
1602-
#else
1603-
if(!i && (!_kbhit() || !read_tty) ) continue;
16041598
# endif
16051599
} else
16061600
i = select(width, (void *)&readfds, (void *)&writefds,
@@ -1799,12 +1793,12 @@ int MAIN(int argc, char **argv)
17991793
}
18001794
}
18011795
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
1802-
#if defined(OPENSSL_USE_STD_INPUT_HANDLE)
1796+
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
1797+
else if (_kbhit())
1798+
# else
18031799
else if ((_kbhit())
18041800
|| (WAIT_OBJECT_0 ==
18051801
WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
1806-
#else
1807-
else if (_kbhit())
18081802
# endif
18091803
#elif defined (OPENSSL_SYS_NETWARE)
18101804
else if (_kbhit())

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ void BIO_clear_flags(BIO *b, int flags);
290290
* BIO_CB_RETURN flag indicates if it is after the call
291291
*/
292292
# define BIO_CB_RETURN 0x80
293-
# define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
293+
# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
294294
# define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
295295
# define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
296296

‎deps/openssl/openssl/crypto/evp/e_aes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
11461146
case EVP_CTRL_CCM_SET_TAG:
11471147
if ((arg & 1) || arg < 4 || arg > 16)
11481148
return 0;
1149-
if ((c->encrypt && ptr) || (!c->encrypt && !ptr))
1149+
if (c->encrypt && ptr)
11501150
return 0;
11511151
if (ptr) {
11521152
cctx->tag_set = 1;

0 commit comments

Comments
 (0)