Skip to content

Commit 2de2672

Browse files
MylesBorinsBethGriggs
authored andcommittedDec 17, 2020
deps: upgrade openssl sources to 1.1.1i
This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1i.tar.gz $ mv openssl-1.1.1i openssl $ git add --all openssl $ git commit openssl PR-URL: #36521 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent dd8fb22 commit 2de2672

File tree

347 files changed

+4246
-4162
lines changed

Some content is hidden

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

347 files changed

+4246
-4162
lines changed
 

‎deps/openssl/openssl/CHANGES

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

10+
Changes between 1.1.1h and 1.1.1i [8 Dec 2020]
11+
12+
*) Fixed NULL pointer deref in the GENERAL_NAME_cmp function
13+
This function could crash if both GENERAL_NAMEs contain an EDIPARTYNAME.
14+
If an attacker can control both items being compared then this could lead
15+
to a possible denial of service attack. OpenSSL itself uses the
16+
GENERAL_NAME_cmp function for two purposes:
17+
1) Comparing CRL distribution point names between an available CRL and a
18+
CRL distribution point embedded in an X509 certificate
19+
2) When verifying that a timestamp response token signer matches the
20+
timestamp authority name (exposed via the API functions
21+
TS_RESP_verify_response and TS_RESP_verify_token)
22+
(CVE-2020-1971)
23+
[Matt Caswell]
24+
25+
*) Add support for Apple Silicon M1 Macs with the darwin64-arm64-cc target.
26+
[Stuart Carnie]
27+
28+
*) The security callback, which can be customised by application code, supports
29+
the security operation SSL_SECOP_TMP_DH. This is defined to take an EVP_PKEY
30+
in the "other" parameter. In most places this is what is passed. All these
31+
places occur server side. However there was one client side call of this
32+
security operation and it passed a DH object instead. This is incorrect
33+
according to the definition of SSL_SECOP_TMP_DH, and is inconsistent with all
34+
of the other locations. Therefore this client side call has been changed to
35+
pass an EVP_PKEY instead.
36+
[Matt Caswell]
37+
38+
*) In 1.1.1h, an expired trusted (root) certificate was not anymore rejected
39+
when validating a certificate path. This check is restored in 1.1.1i.
40+
[David von Oheimb]
41+
42+
Changes between 1.1.1g and 1.1.1h [22 Sep 2020]
43+
44+
*) Certificates with explicit curve parameters are now disallowed in
45+
verification chains if the X509_V_FLAG_X509_STRICT flag is used.
46+
[Tomas Mraz]
47+
48+
*) The 'MinProtocol' and 'MaxProtocol' configuration commands now silently
49+
ignore TLS protocol version bounds when configuring DTLS-based contexts, and
50+
conversely, silently ignore DTLS protocol version bounds when configuring
51+
TLS-based contexts. The commands can be repeated to set bounds of both
52+
types. The same applies with the corresponding "min_protocol" and
53+
"max_protocol" command-line switches, in case some application uses both TLS
54+
and DTLS.
55+
56+
SSL_CTX instances that are created for a fixed protocol version (e.g.
57+
TLSv1_server_method()) also silently ignore version bounds. Previously
58+
attempts to apply bounds to these protocol versions would result in an
59+
error. Now only the "version-flexible" SSL_CTX instances are subject to
60+
limits in configuration files in command-line options.
61+
[Viktor Dukhovni]
62+
63+
*) Handshake now fails if Extended Master Secret extension is dropped
64+
on renegotiation.
65+
[Tomas Mraz]
66+
67+
*) Accidentally, an expired trusted (root) certificate is not anymore rejected
68+
when validating a certificate path.
69+
[David von Oheimb]
70+
71+
*) The Oracle Developer Studio compiler will start reporting deprecated APIs
72+
1073
Changes between 1.1.1f and 1.1.1g [21 Apr 2020]
1174

1275
*) Fixed segmentation fault in SSL_check_chain()

‎deps/openssl/openssl/Configurations/10-main.conf

+8-8
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ my %targets = (
741741
inherit_from => [ "linux-generic32", asm("mips64_asm") ],
742742
cflags => add("-mabi=n32"),
743743
cxxflags => add("-mabi=n32"),
744-
bn_ops => "SIXTY_FOUR_BIT RC4_CHAR",
744+
bn_ops => "RC4_CHAR",
745745
perlasm_scheme => "n32",
746746
multilib => "32",
747747
},
@@ -1125,7 +1125,7 @@ my %targets = (
11251125
CFLAGS => picker(debug => "-O0 -g",
11261126
release => "-O"),
11271127
cflags => add(threads("-pthread")),
1128-
ex_libs => threads("-pthread"),
1128+
ex_libs => add(threads("-pthread")),
11291129
bn_ops => "BN_LLONG RC4_CHAR",
11301130
perlasm_scheme => "aix32",
11311131
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -1138,7 +1138,7 @@ my %targets = (
11381138
CFLAGS => picker(debug => "-O0 -g",
11391139
release => "-O"),
11401140
cflags => combine("-maix64", threads("-pthread")),
1141-
ex_libs => threads("-pthread"),
1141+
ex_libs => add(threads("-pthread")),
11421142
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
11431143
perlasm_scheme => "aix64",
11441144
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -1154,7 +1154,7 @@ my %targets = (
11541154
cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst",
11551155
threads("-qthreaded")),
11561156
cppflags => threads("-D_THREAD_SAFE"),
1157-
ex_libs => threads("-lpthreads"),
1157+
ex_libs => add(threads("-lpthreads")),
11581158
bn_ops => "BN_LLONG RC4_CHAR",
11591159
perlasm_scheme => "aix32",
11601160
shared_cflag => "-qpic",
@@ -1169,7 +1169,7 @@ my %targets = (
11691169
cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst",
11701170
threads("-qthreaded")),
11711171
cppflags => threads("-D_THREAD_SAFE"),
1172-
ex_libs => threads("-lpthreads"),
1172+
ex_libs => add(threads("-lpthreads")),
11731173
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
11741174
perlasm_scheme => "aix64",
11751175
dso_scheme => "dlfcn",
@@ -1365,9 +1365,9 @@ my %targets = (
13651365
}
13661366
push @ex_libs, '$(PORTSDK_LIBPATH)/portlib.lib'
13671367
if (defined(env('PORTSDK_LIBPATH')));
1368-
push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib'
1369-
if (env('TARGETCPU') eq "X86");
1370-
return @ex_libs;
1368+
push @ex_libs, '/nodefaultlib coredll.lib corelibc.lib'
1369+
if (env('TARGETCPU') =~ /^X86|^ARMV4[IT]/);
1370+
return join(" ", @ex_libs);
13711371
}),
13721372
},
13731373

0 commit comments

Comments
 (0)
Please sign in to comment.