Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 456c22f

Browse files
Shigeki OhtsuJulien Gilli
Shigeki Ohtsu
authored and
Julien Gilli
committed
deps: upgrade to openssl-1.0.1o
This just replaces all sources of openssl-1.0.1o.tar.gz into deps/openssl/openssl. PR: #25523 PR-URL: #25523 Reviewed-By: Julien Gilli <[email protected]>
1 parent d38e865 commit 456c22f

File tree

290 files changed

+2762
-1474
lines changed

Some content is hidden

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

290 files changed

+2762
-1474
lines changed

deps/openssl/openssl/CHANGES

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

5+
Changes between 1.0.1n and 1.0.1o [12 Jun 2015]
6+
7+
*) Fix HMAC ABI incompatibility. The previous version introduced an ABI
8+
incompatibility in the handling of HMAC. The previous ABI has now been
9+
restored.
10+
11+
Changes between 1.0.1m and 1.0.1n [11 Jun 2015]
12+
13+
*) Malformed ECParameters causes infinite loop
14+
15+
When processing an ECParameters structure OpenSSL enters an infinite loop
16+
if the curve specified is over a specially malformed binary polynomial
17+
field.
18+
19+
This can be used to perform denial of service against any
20+
system which processes public keys, certificate requests or
21+
certificates. This includes TLS clients and TLS servers with
22+
client authentication enabled.
23+
24+
This issue was reported to OpenSSL by Joseph Barr-Pixton.
25+
(CVE-2015-1788)
26+
[Andy Polyakov]
27+
28+
*) Exploitable out-of-bounds read in X509_cmp_time
29+
30+
X509_cmp_time does not properly check the length of the ASN1_TIME
31+
string and can read a few bytes out of bounds. In addition,
32+
X509_cmp_time accepts an arbitrary number of fractional seconds in the
33+
time string.
34+
35+
An attacker can use this to craft malformed certificates and CRLs of
36+
various sizes and potentially cause a segmentation fault, resulting in
37+
a DoS on applications that verify certificates or CRLs. TLS clients
38+
that verify CRLs are affected. TLS clients and servers with client
39+
authentication enabled may be affected if they use custom verification
40+
callbacks.
41+
42+
This issue was reported to OpenSSL by Robert Swiecki (Google), and
43+
independently by Hanno B�ck.
44+
(CVE-2015-1789)
45+
[Emilia K�sper]
46+
47+
*) PKCS7 crash with missing EnvelopedContent
48+
49+
The PKCS#7 parsing code does not handle missing inner EncryptedContent
50+
correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs
51+
with missing content and trigger a NULL pointer dereference on parsing.
52+
53+
Applications that decrypt PKCS#7 data or otherwise parse PKCS#7
54+
structures from untrusted sources are affected. OpenSSL clients and
55+
servers are not affected.
56+
57+
This issue was reported to OpenSSL by Michal Zalewski (Google).
58+
(CVE-2015-1790)
59+
[Emilia K�sper]
60+
61+
*) CMS verify infinite loop with unknown hash function
62+
63+
When verifying a signedData message the CMS code can enter an infinite loop
64+
if presented with an unknown hash function OID. This can be used to perform
65+
denial of service against any system which verifies signedData messages using
66+
the CMS code.
67+
This issue was reported to OpenSSL by Johannes Bauer.
68+
(CVE-2015-1792)
69+
[Stephen Henson]
70+
71+
*) Race condition handling NewSessionTicket
72+
73+
If a NewSessionTicket is received by a multi-threaded client when attempting to
74+
reuse a previous ticket then a race condition can occur potentially leading to
75+
a double free of the ticket data.
76+
(CVE-2015-1791)
77+
[Matt Caswell]
78+
79+
*) Reject DH handshakes with parameters shorter than 768 bits.
80+
[Kurt Roeckx and Emilia Kasper]
81+
582
Changes between 1.0.1l and 1.0.1m [19 Mar 2015]
683

784
*) Segmentation fault in ASN1_TYPE_cmp fix

deps/openssl/openssl/Configure

+5-5
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ my %table=(
230230

231231
#### SPARC Solaris with GNU C setups
232232
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
233-
"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
233+
"solaris-sparcv8-gcc","gcc:-mcpu=v8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
234234
# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
235235
"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
236236
"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
237237
####
238-
"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
238+
"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=v8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
239239
"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
240240

241241
#### SPARC Solaris with Sun C setups
@@ -252,7 +252,7 @@ my %table=(
252252

253253
#### SunOS configs, assuming sparc for the gcc one.
254254
#"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
255-
"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
255+
"sunos-gcc","gcc:-O3 -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
256256

257257
#### IRIX 5.x configs
258258
# -mips2 flag is added by ./config when appropriate.
@@ -379,7 +379,7 @@ my %table=(
379379
#### SPARC Linux setups
380380
# Ray Miller <[email protected]> has patiently
381381
# assisted with debugging of following two configs.
382-
"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
382+
"linux-sparcv8","gcc:-mcpu=v8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
383383
# it's a real mess with -mcpu=ultrasparc option under Linux, but
384384
# -Wa,-Av8plus should do the trick no matter what.
385385
"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -413,7 +413,7 @@ my %table=(
413413
"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
414414
"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
415415
"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
416-
"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
416+
"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
417417

418418
"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
419419
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it

deps/openssl/openssl/Makefile

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

7-
VERSION=1.0.1m
7+
VERSION=1.0.1o
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -186,7 +186,7 @@ WTARFILE= $(NAME)-win.tar
186186
EXHEADER= e_os2.h
187187
HEADER= e_os.h
188188

189-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
189+
all: Makefile build_all
190190

191191
# as we stick to -e, CLEARENV ensures that local variables in lower
192192
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -272,7 +272,10 @@ reflect:
272272
sub_all: build_all
273273
build_all: build_libs build_apps build_tests build_tools
274274

275-
build_libs: build_crypto build_ssl build_engines
275+
build_libs: build_libcrypto build_libssl openssl.pc
276+
277+
build_libcrypto: build_crypto build_engines libcrypto.pc
278+
build_libssl: build_ssl libssl.pc
276279

277280
build_crypto:
278281
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -461,6 +464,9 @@ tests: rehash
461464
report:
462465
@$(PERL) util/selftest.pl
463466

467+
update: errors stacks util/libeay.num util/ssleay.num TABLE
468+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
469+
464470
depend:
465471
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
466472

@@ -485,26 +491,10 @@ util/libeay.num::
485491
util/ssleay.num::
486492
$(PERL) util/mkdef.pl ssl update
487493

488-
crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
489-
$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
490-
crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
491-
$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
492-
crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
493-
$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
494-
495-
apps/openssl-vms.cnf: apps/openssl.cnf
496-
$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
497-
498-
crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
499-
$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
500-
501-
502494
TABLE: Configure
503495
(echo 'Output of `Configure TABLE'"':"; \
504496
$(PERL) Configure TABLE) > TABLE
505497

506-
update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
507-
508498
# Build distribution tar-file. As the list of files returned by "find" is
509499
# pretty long, on several platforms a "too many arguments" error or similar
510500
# would occur. Therefore the list of files is temporarily stored into a file

deps/openssl/openssl/Makefile.bak

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

7-
VERSION=1.0.1m-dev
7+
VERSION=1.0.1o-dev
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -186,7 +186,7 @@ WTARFILE= $(NAME)-win.tar
186186
EXHEADER= e_os2.h
187187
HEADER= e_os.h
188188

189-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
189+
all: Makefile build_all
190190

191191
# as we stick to -e, CLEARENV ensures that local variables in lower
192192
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -272,7 +272,10 @@ reflect:
272272
sub_all: build_all
273273
build_all: build_libs build_apps build_tests build_tools
274274

275-
build_libs: build_crypto build_ssl build_engines
275+
build_libs: build_libcrypto build_libssl openssl.pc
276+
277+
build_libcrypto: build_crypto build_engines libcrypto.pc
278+
build_libssl: build_ssl libssl.pc
276279

277280
build_crypto:
278281
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -461,6 +464,9 @@ tests: rehash
461464
report:
462465
@$(PERL) util/selftest.pl
463466

467+
update: errors stacks util/libeay.num util/ssleay.num TABLE
468+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
469+
464470
depend:
465471
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
466472

@@ -485,26 +491,10 @@ util/libeay.num::
485491
util/ssleay.num::
486492
$(PERL) util/mkdef.pl ssl update
487493

488-
crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
489-
$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
490-
crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
491-
$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
492-
crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
493-
$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
494-
495-
apps/openssl-vms.cnf: apps/openssl.cnf
496-
$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
497-
498-
crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
499-
$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
500-
501-
502494
TABLE: Configure
503495
(echo 'Output of `Configure TABLE'"':"; \
504496
$(PERL) Configure TABLE) > TABLE
505497

506-
update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
507-
508498
# Build distribution tar-file. As the list of files returned by "find" is
509499
# pretty long, on several platforms a "too many arguments" error or similar
510500
# would occur. Therefore the list of files is temporarily stored into a file

deps/openssl/openssl/Makefile.org

+8-18
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ WTARFILE= $(NAME)-win.tar
184184
EXHEADER= e_os2.h
185185
HEADER= e_os.h
186186

187-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
187+
all: Makefile build_all
188188

189189
# as we stick to -e, CLEARENV ensures that local variables in lower
190190
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -270,7 +270,10 @@ reflect:
270270
sub_all: build_all
271271
build_all: build_libs build_apps build_tests build_tools
272272

273-
build_libs: build_crypto build_ssl build_engines
273+
build_libs: build_libcrypto build_libssl openssl.pc
274+
275+
build_libcrypto: build_crypto build_engines libcrypto.pc
276+
build_libssl: build_ssl libssl.pc
274277

275278
build_crypto:
276279
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -459,6 +462,9 @@ tests: rehash
459462
report:
460463
@$(PERL) util/selftest.pl
461464

465+
update: errors stacks util/libeay.num util/ssleay.num TABLE
466+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
467+
462468
depend:
463469
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
464470

@@ -483,26 +489,10 @@ util/libeay.num::
483489
util/ssleay.num::
484490
$(PERL) util/mkdef.pl ssl update
485491

486-
crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
487-
$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
488-
crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
489-
$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
490-
crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
491-
$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
492-
493-
apps/openssl-vms.cnf: apps/openssl.cnf
494-
$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
495-
496-
crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
497-
$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
498-
499-
500492
TABLE: Configure
501493
(echo 'Output of `Configure TABLE'"':"; \
502494
$(PERL) Configure TABLE) > TABLE
503495

504-
update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
505-
506496
# Build distribution tar-file. As the list of files returned by "find" is
507497
# pretty long, on several platforms a "too many arguments" error or similar
508498
# would occur. Therefore the list of files is temporarily stored into a file

deps/openssl/openssl/NEWS

+12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
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.1n and OpenSSL 1.0.1o [12 Jun 2015]
9+
10+
o Fix HMAC ABI incompatibility
11+
12+
Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015]
13+
14+
o Malformed ECParameters causes infinite loop (CVE-2015-1788)
15+
o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
16+
o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
17+
o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
18+
o Race condition handling NewSessionTicket (CVE-2015-1791)
19+
820
Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
921

1022
o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)

deps/openssl/openssl/README

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

2-
OpenSSL 1.0.1m 19 Mar 2015
2+
OpenSSL 1.0.1o 12 Jun 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/Makefile

+11-8
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
9494
sreq.o: req.c
9595
$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
9696

97+
openssl-vms.cnf: openssl.cnf
98+
$(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf
99+
97100
files:
98101
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
99102

@@ -127,12 +130,12 @@ links:
127130
lint:
128131
lint -DLINT $(INCLUDES) $(SRC)>fluff
129132

130-
depend:
131-
@if [ -z "$(THIS)" ]; then \
132-
$(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
133-
else \
134-
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
135-
fi
133+
update: openssl-vms.cnf local_depend
134+
135+
depend: local_depend
136+
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
137+
local_depend:
138+
@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
136139

137140
dclean:
138141
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -144,10 +147,10 @@ clean:
144147
rm -f req
145148

146149
$(DLIBSSL):
147-
(cd ..; $(MAKE) DIRS=ssl all)
150+
(cd ..; $(MAKE) build_libssl)
148151

149152
$(DLIBCRYPTO):
150-
(cd ..; $(MAKE) DIRS=crypto all)
153+
(cd ..; $(MAKE) build_libcrypto)
151154

152155
$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
153156
$(RM) $(EXE)

0 commit comments

Comments
 (0)