Skip to content

Commit 05e48fd

Browse files
shigekirvagg
shigeki
authored and
rvagg
committed
deps: upgrade openssl sources to 1.1.0i
This updates all sources in deps/openssl/openssl with openssl-1.1.0i. PR-URL: #22318 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rod Vagg <[email protected]>
1 parent 88665b3 commit 05e48fd

File tree

406 files changed

+6034
-2897
lines changed

Some content is hidden

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

406 files changed

+6034
-2897
lines changed

‎deps/openssl/openssl/.gitignore

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
# Ignore editor artefacts
2+
/.dir-locals.el
3+
4+
# Top level excludes
5+
/Makefile.orig
6+
/MINFO
7+
/TABLE
8+
/*.a
9+
/*.pc
10+
/rehash.time
11+
/inc.*
12+
/makefile.*
13+
/out.*
14+
/tmp.*
15+
/configdata.pm
16+
17+
# *all* Makefiles
18+
Makefile
19+
# ... except in demos
20+
!/demos/*/Makefile
21+
22+
# Links under apps
23+
/apps/CA.pl
24+
/apps/tsget
25+
/apps/tsget.pl
26+
/apps/md4.c
27+
28+
# Auto generated headers
29+
/crypto/buildinf.h
30+
/apps/progs.h
31+
/crypto/include/internal/*_conf.h
32+
/openssl/include/opensslconf.h
33+
/util/domd
34+
35+
# Executables
36+
/apps/openssl
37+
/test/sha256t
38+
/test/sha512t
39+
/test/gost2814789t
40+
/test/ssltest_old
41+
/test/*test
42+
/test/fips_aesavs
43+
/test/fips_desmovs
44+
/test/fips_dhvs
45+
/test/fips_drbgvs
46+
/test/fips_dssvs
47+
/test/fips_ecdhvs
48+
/test/fips_ecdsavs
49+
/test/fips_rngvs
50+
/test/fips_test_suite
51+
/test/ssltest_old
52+
/test/x509aux
53+
/test/v3ext
54+
/test/versions
55+
56+
# Certain files that get created by tests on the fly
57+
/test/test-runs
58+
/test/buildtest_*
59+
60+
# Fuzz stuff.
61+
# Anything without an extension is an executable on Unix, so we keep files
62+
# with extensions. And we keep the corpora subddir versioned as well.
63+
# Anything more generic with extensions that should be ignored will be taken
64+
# care of by general ignores for those extensions (*.o, *.obj, *.exe, ...)
65+
/fuzz/*
66+
!/fuzz/README*
67+
!/fuzz/corpora
68+
!/fuzz/*.*
69+
70+
# Misc auto generated files
71+
/include/openssl/opensslconf.h
72+
/tools/c_rehash
73+
/tools/c_rehash.pl
74+
/util/shlib_wrap.sh
75+
/tags
76+
/TAGS
77+
/crypto.map
78+
/ssl.map
79+
80+
# Windows (legacy)
81+
/tmp32
82+
/tmp32.dbg
83+
/tmp32dll
84+
/tmp32dll.dbg
85+
/out32
86+
/out32.dbg
87+
/out32dll
88+
/out32dll.dbg
89+
/inc32
90+
/MINFO
91+
/ms/.rnd
92+
/ms/bcb.mak
93+
/ms/libeay32.def
94+
/ms/nt.mak
95+
/ms/ntdll.mak
96+
/ms/ssleay32.def
97+
/ms/version32.rc
98+
99+
# Files created on other branches that are not held in git, and are not
100+
# needed on this branch
101+
/include/openssl/asn1_mac.h
102+
/include/openssl/des_old.h
103+
/include/openssl/fips.h
104+
/include/openssl/fips_rand.h
105+
/include/openssl/krb5_asn.h
106+
/include/openssl/kssl.h
107+
/include/openssl/pq_compat.h
108+
/include/openssl/ssl23.h
109+
/include/openssl/tmdiff.h
110+
/include/openssl/ui_compat.h
111+
/test/fips_aesavs.c
112+
/test/fips_desmovs.c
113+
/test/fips_dsatest.c
114+
/test/fips_dssvs.c
115+
/test/fips_hmactest.c
116+
/test/fips_randtest.c
117+
/test/fips_rngvs.c
118+
/test/fips_rsagtest.c
119+
/test/fips_rsastest.c
120+
/test/fips_rsavtest.c
121+
/test/fips_shatest.c
122+
/test/fips_test_suite.c
123+
/test/shatest.c
124+
125+
##### Generic patterns
126+
# Auto generated assembly language source files
127+
*.s
128+
!/crypto/*/asm/*.s
129+
/crypto/arm*.S
130+
/crypto/*/*.S
131+
*.asm
132+
!/crypto/*/asm/*.asm
133+
134+
# Object files
135+
*.o
136+
*.obj
137+
138+
# editor artefacts
139+
*.swp
140+
.#*
141+
\#*#
142+
*~
143+
144+
# Certificate symbolic links
145+
*.0
146+
147+
# All kinds of executables
148+
*.so
149+
*.so.*
150+
*.dylib
151+
*.dylib.*
152+
*.dll
153+
*.dll.*
154+
*.exe
155+
*.pyc
156+
*.exp
157+
*.lib
158+
*.pdb
159+
*.ilk
160+
*.def
161+
*.rc
162+
*.res
163+
164+
# Misc generated stuff
165+
Makefile.save
166+
/crypto/**/lib
167+
/engines/**/lib
168+
/ssl/**/lib
169+
*.bak
170+
cscope.*
171+
*.d
172+
pod2htmd.tmp
173+
174+
# Windows manifest files
175+
*.manifest

‎deps/openssl/openssl/.travis.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ matrix:
6161
sources:
6262
- ubuntu-toolchain-r-test
6363
compiler: gcc-5
64-
env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
64+
env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
6565
- os: linux
6666
addons:
6767
apt:
6868
packages:
6969
- binutils-mingw-w64
7070
- gcc-mingw-w64
7171
compiler: i686-w64-mingw32-gcc
72-
env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz"
72+
env: CONFIG_OPTS="no-pic"
7373
- os: linux
7474
addons:
7575
apt:
@@ -85,7 +85,7 @@ matrix:
8585
- binutils-mingw-w64
8686
- gcc-mingw-w64
8787
compiler: x86_64-w64-mingw32-gcc
88-
env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz"
88+
env: CONFIG_OPTS="no-pic"
8989
- os: linux
9090
addons:
9191
apt:
@@ -112,6 +112,10 @@ before_script:
112112
srcdir=.;
113113
top=.;
114114
fi
115+
- if [ -n "$UBUNTU_GCC_HACK" ]; then
116+
$CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt;
117+
CC="$CC -specs=gcc-specs.txt";
118+
fi
115119
- if [ "$CC" == i686-w64-mingw32-gcc ]; then
116120
export CROSS_COMPILE=${CC%%gcc}; unset CC;
117121
$srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
@@ -186,7 +190,7 @@ script:
186190
fi
187191
- if [ -n "$DESTDIR" ]; then
188192
mkdir "../$DESTDIR";
189-
if $make install install_docs DESTDIR="../$DESTDIR"; then
193+
if $make install DESTDIR="../$DESTDIR"; then
190194
echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS OK';
191195
else
192196
echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS FAILED'; false;

‎deps/openssl/openssl/CHANGES

+85-10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,81 @@
77
https://github.com/openssl/openssl/commits/ and pick the appropriate
88
release branch.
99

10+
Changes between 1.1.0h and 1.1.0i [14 Aug 2018]
11+
12+
*) Client DoS due to large DH parameter
13+
14+
During key agreement in a TLS handshake using a DH(E) based ciphersuite a
15+
malicious server can send a very large prime value to the client. This will
16+
cause the client to spend an unreasonably long period of time generating a
17+
key for this prime resulting in a hang until the client has finished. This
18+
could be exploited in a Denial Of Service attack.
19+
20+
This issue was reported to OpenSSL on 5th June 2018 by Guido Vranken
21+
(CVE-2018-0732)
22+
[Guido Vranken]
23+
24+
*) Cache timing vulnerability in RSA Key Generation
25+
26+
The OpenSSL RSA Key generation algorithm has been shown to be vulnerable to
27+
a cache timing side channel attack. An attacker with sufficient access to
28+
mount cache timing attacks during the RSA key generation process could
29+
recover the private key.
30+
31+
This issue was reported to OpenSSL on 4th April 2018 by Alejandro Cabrera
32+
Aldaya, Billy Brumley, Cesar Pereida Garcia and Luis Manuel Alvarez Tapia.
33+
(CVE-2018-0737)
34+
[Billy Brumley]
35+
36+
*) Make EVP_PKEY_asn1_new() a bit stricter about its input. A NULL pem_str
37+
parameter is no longer accepted, as it leads to a corrupt table. NULL
38+
pem_str is reserved for alias entries only.
39+
[Richard Levitte]
40+
41+
*) Revert blinding in ECDSA sign and instead make problematic addition
42+
length-invariant. Switch even to fixed-length Montgomery multiplication.
43+
[Andy Polyakov]
44+
45+
*) Change generating and checking of primes so that the error rate of not
46+
being prime depends on the intended use based on the size of the input.
47+
For larger primes this will result in more rounds of Miller-Rabin.
48+
The maximal error rate for primes with more than 1080 bits is lowered
49+
to 2^-128.
50+
[Kurt Roeckx, Annie Yousar]
51+
52+
*) Increase the number of Miller-Rabin rounds for DSA key generating to 64.
53+
[Kurt Roeckx]
54+
55+
*) Add blinding to ECDSA and DSA signatures to protect against side channel
56+
attacks discovered by Keegan Ryan (NCC Group).
57+
[Matt Caswell]
58+
59+
*) When unlocking a pass phrase protected PEM file or PKCS#8 container, we
60+
now allow empty (zero character) pass phrases.
61+
[Richard Levitte]
62+
63+
*) Certificate time validation (X509_cmp_time) enforces stricter
64+
compliance with RFC 5280. Fractional seconds and timezone offsets
65+
are no longer allowed.
66+
[Emilia Käsper]
67+
68+
*) Fixed a text canonicalisation bug in CMS
69+
70+
Where a CMS detached signature is used with text content the text goes
71+
through a canonicalisation process first prior to signing or verifying a
72+
signature. This process strips trailing space at the end of lines, converts
73+
line terminators to CRLF and removes additional trailing line terminators
74+
at the end of a file. A bug in the canonicalisation process meant that
75+
some characters, such as form-feed, were incorrectly treated as whitespace
76+
and removed. This is contrary to the specification (RFC5485). This fix
77+
could mean that detached text data signed with an earlier version of
78+
OpenSSL 1.1.0 may fail to verify using the fixed version, or text data
79+
signed with a fixed OpenSSL may fail to verify with an earlier version of
80+
OpenSSL 1.1.0. A workaround is to only verify the canonicalised text data
81+
and use the "-binary" flag (for the "cms" command line application) or set
82+
the SMIME_BINARY/PKCS7_BINARY/CMS_BINARY flags (if using CMS_verify()).
83+
[Matt Caswell]
84+
1085
Changes between 1.1.0g and 1.1.0h [27 Mar 2018]
1186

1287
*) Constructed ASN.1 types with a recursive definition could exceed the stack
@@ -1144,13 +1219,13 @@
11441219
[Steve Henson]
11451220

11461221
*) Experimental encrypt-then-mac support.
1147-
1222+
11481223
Experimental support for encrypt then mac from
11491224
draft-gutmann-tls-encrypt-then-mac-02.txt
11501225

11511226
To enable it set the appropriate extension number (0x42 for the test
11521227
server) using e.g. -DTLSEXT_TYPE_encrypt_then_mac=0x42
1153-
1228+
11541229
For non-compliant peers (i.e. just about everything) this should have no
11551230
effect.
11561231

@@ -1201,7 +1276,7 @@
12011276

12021277
*) Use separate DRBG fields for internal and external flags. New function
12031278
FIPS_drbg_health_check() to perform on demand health checking. Add
1204-
generation tests to fips_test_suite with reduced health check interval to
1279+
generation tests to fips_test_suite with reduced health check interval to
12051280
demonstrate periodic health checking. Add "nodh" option to
12061281
fips_test_suite to skip very slow DH test.
12071282
[Steve Henson]
@@ -1215,7 +1290,7 @@
12151290
combination: call this in fips_test_suite.
12161291
[Steve Henson]
12171292

1218-
*) Add support for canonical generation of DSA parameter 'g'. See
1293+
*) Add support for canonical generation of DSA parameter 'g'. See
12191294
FIPS 186-3 A.2.3.
12201295

12211296
*) Add support for HMAC DRBG from SP800-90. Update DRBG algorithm test and
@@ -1239,7 +1314,7 @@
12391314
requested amount of entropy.
12401315
[Steve Henson]
12411316

1242-
*) Add PRNG security strength checks to RSA, DSA and ECDSA using
1317+
*) Add PRNG security strength checks to RSA, DSA and ECDSA using
12431318
information in FIPS186-3, SP800-57 and SP800-131A.
12441319
[Steve Henson]
12451320

@@ -1331,7 +1406,7 @@
13311406
can be set or retrieved with a ctrl. The IV length is by default 12
13321407
bytes (96 bits) but can be set to an alternative value. If the IV
13331408
length exceeds the maximum IV length (currently 16 bytes) it cannot be
1334-
set before the key.
1409+
set before the key.
13351410
[Steve Henson]
13361411

13371412
*) New flag in ciphers: EVP_CIPH_FLAG_CUSTOM_CIPHER. This means the
@@ -1374,7 +1449,7 @@
13741449
Add CMAC pkey methods.
13751450
[Steve Henson]
13761451

1377-
*) Experimental renegotiation in s_server -www mode. If the client
1452+
*) Experimental renegotiation in s_server -www mode. If the client
13781453
browses /reneg connection is renegotiated. If /renegcert it is
13791454
renegotiated requesting a certificate.
13801455
[Steve Henson]
@@ -1394,7 +1469,7 @@
13941469
*) New macro __owur for "OpenSSL Warn Unused Result". This makes use of
13951470
a gcc attribute to warn if the result of a function is ignored. This
13961471
is enable if DEBUG_UNUSED is set. Add to several functions in evp.h
1397-
whose return value is often ignored.
1472+
whose return value is often ignored.
13981473
[Steve Henson]
13991474

14001475
*) New -noct, -requestct, -requirect and -ctlogfile options for s_client.
@@ -3628,7 +3703,7 @@
36283703

36293704
*) New option -sigopt to dgst utility. Update dgst to use
36303705
EVP_Digest{Sign,Verify}*. These two changes make it possible to use
3631-
alternative signing parameters such as X9.31 or PSS in the dgst
3706+
alternative signing parameters such as X9.31 or PSS in the dgst
36323707
utility.
36333708
[Steve Henson]
36343709

@@ -12379,7 +12454,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
1237912454
*) Fixed sk_insert which never worked properly.
1238012455
[Steve Henson]
1238112456

12382-
*) Fix ASN1 macros so they can handle indefinite length constructed
12457+
*) Fix ASN1 macros so they can handle indefinite length constructed
1238312458
EXPLICIT tags. Some non standard certificates use these: they can now
1238412459
be read in.
1238512460
[Steve Henson]

0 commit comments

Comments
 (0)