Skip to content

Commit 6120f24

Browse files
sam-githubrvagg
authored andcommitted
deps: upgrade openssl sources to 1.0.2q
This updates all sources in deps/openssl/openssl with openssl-1.0.2q. PR-URL: #24530 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 46f0f8a commit 6120f24

Some content is hidden

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

143 files changed

+1893
-38856
lines changed

deps/openssl/openssl.gypi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@
407407
'openssl/crypto/evp/pmeth_lib.c',
408408
'openssl/crypto/ex_data.c',
409409
'openssl/crypto/fips_ers.c',
410+
'openssl/crypto/getenv.c',
410411
'openssl/crypto/hmac/hm_ameth.c',
411412
'openssl/crypto/hmac/hm_pmeth.c',
412413
'openssl/crypto/hmac/hmac.c',

deps/openssl/openssl/CHANGES

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,36 @@
77
https://github.com/openssl/openssl/commits/ and pick the appropriate
88
release branch.
99

10+
Changes between 1.0.2p and 1.0.2q [20 Nov 2018]
11+
12+
*) Microarchitecture timing vulnerability in ECC scalar multiplication
13+
14+
OpenSSL ECC scalar multiplication, used in e.g. ECDSA and ECDH, has been
15+
shown to be vulnerable to a microarchitecture timing side channel attack.
16+
An attacker with sufficient access to mount local timing attacks during
17+
ECDSA signature generation could recover the private key.
18+
19+
This issue was reported to OpenSSL on 26th October 2018 by Alejandro
20+
Cabrera Aldaya, Billy Brumley, Sohaib ul Hassan, Cesar Pereida Garcia and
21+
Nicola Tuveri.
22+
(CVE-2018-5407)
23+
[Billy Brumley]
24+
25+
*) Timing vulnerability in DSA signature generation
26+
27+
The OpenSSL DSA signature algorithm has been shown to be vulnerable to a
28+
timing side channel attack. An attacker could use variations in the signing
29+
algorithm to recover the private key.
30+
31+
This issue was reported to OpenSSL on 16th October 2018 by Samuel Weiser.
32+
(CVE-2018-0734)
33+
[Paul Dale]
34+
35+
*) Resolve a compatibility issue in EC_GROUP handling with the FIPS Object
36+
Module, accidentally introduced while backporting security fixes from the
37+
development branch and hindering the use of ECC in FIPS mode.
38+
[Nicola Tuveri]
39+
1040
Changes between 1.0.2o and 1.0.2p [14 Aug 2018]
1141

1242
*) Client DoS due to large DH parameter

deps/openssl/openssl/Makefile

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

7-
VERSION=1.0.2p
7+
VERSION=1.0.2q
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
1111
SHLIB_VERSION_HISTORY=
1212
SHLIB_MAJOR=1
1313
SHLIB_MINOR=0.0
14-
SHLIB_EXT=
15-
PLATFORM=dist
16-
OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
17-
CONFIGURE_ARGS=dist
18-
SHLIB_TARGET=
14+
SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
15+
PLATFORM=linux-x86_64
16+
OPTIONS=-Wa,--noexecstack no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
17+
CONFIGURE_ARGS=linux-x86_64 -Wa,--noexecstack
18+
SHLIB_TARGET=linux-shared
1919

2020
# HERE indicates where this Makefile lives. This can be used to indicate
2121
# where sub-Makefiles are expected to be. Currently has very limited usage,
@@ -59,11 +59,11 @@ OPENSSLDIR=/usr/local/ssl
5959
# equal 4.
6060
# PKCS1_CHECK - pkcs1 tests.
6161

62-
CC= cc
63-
CFLAG= -O
62+
CC= gcc
63+
CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM
6464
DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS
6565
PEX_LIBS=
66-
EX_LIBS=
66+
EX_LIBS= -ldl
6767
EXE_EXT=
6868
ARFLAGS=
6969
AR= ar $(ARFLAGS) r
@@ -73,7 +73,7 @@ NM= nm
7373
PERL= /usr/bin/perl
7474
TAR= tar
7575
TARFLAGS= --no-recursion
76-
MAKEDEPPROG= cc
76+
MAKEDEPPROG= gcc
7777
LIBDIR=lib
7878

7979
# We let the C compiler driver to take care of .s files. This is done in
@@ -89,23 +89,23 @@ ASFLAG=$(CFLAG)
8989
PROCESSOR=
9090

9191
# CPUID module collects small commonly used assembler snippets
92-
CPUID_OBJ= mem_clr.o
93-
BN_ASM= bn_asm.o
94-
EC_ASM=
92+
CPUID_OBJ= x86_64cpuid.o
93+
BN_ASM= x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
94+
EC_ASM= ecp_nistz256.o ecp_nistz256-x86_64.o
9595
DES_ENC= des_enc.o fcrypt_b.o
96-
AES_ENC= aes_core.o aes_cbc.o
96+
AES_ENC= aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
9797
BF_ENC= bf_enc.o
9898
CAST_ENC= c_enc.o
99-
RC4_ENC= rc4_enc.o rc4_skey.o
99+
RC4_ENC= rc4-x86_64.o rc4-md5-x86_64.o
100100
RC5_ENC= rc5_enc.o
101-
MD5_ASM_OBJ=
102-
SHA1_ASM_OBJ=
101+
MD5_ASM_OBJ= md5-x86_64.o
102+
SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
103103
RMD160_ASM_OBJ=
104-
WP_ASM_OBJ= wp_block.o
105-
CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
106-
MODES_ASM_OBJ=
104+
WP_ASM_OBJ= wp-x86_64.o
105+
CMLL_ENC= cmll-x86_64.o cmll_misc.o
106+
MODES_ASM_OBJ= ghash-x86_64.o aesni-gcm-x86_64.o
107107
ENGINES_ASM_OBJ=
108-
PERLASM_SCHEME=
108+
PERLASM_SCHEME= elf
109109

110110
# KRB5 stuff
111111
KRB5_INCLUDES=
@@ -177,8 +177,8 @@ LIBS= libcrypto.a libssl.a
177177
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
178178
SHARED_SSL=libssl$(SHLIB_EXT)
179179
SHARED_LIBS=
180-
SHARED_LIBS_LINK_EXTS=
181-
SHARED_LDFLAGS=
180+
SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
181+
SHARED_LDFLAGS=-m64
182182

183183
GENERAL= Makefile
184184
BASENAME= openssl

deps/openssl/openssl/Makefile.bak

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

7-
VERSION=1.0.2p
7+
VERSION=1.0.2q-dev
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
1111
SHLIB_VERSION_HISTORY=
1212
SHLIB_MAJOR=1
1313
SHLIB_MINOR=0.0
14-
SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
15-
PLATFORM=linux-x86_64
16-
OPTIONS=-Wa,--noexecstack no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
17-
CONFIGURE_ARGS=linux-x86_64 -Wa,--noexecstack
18-
SHLIB_TARGET=linux-shared
14+
SHLIB_EXT=
15+
PLATFORM=gcc
16+
OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
17+
CONFIGURE_ARGS=gcc
18+
SHLIB_TARGET=
1919

2020
# HERE indicates where this Makefile lives. This can be used to indicate
2121
# where sub-Makefiles are expected to be. Currently has very limited usage,
@@ -60,10 +60,10 @@ OPENSSLDIR=/usr/local/ssl
6060
# PKCS1_CHECK - pkcs1 tests.
6161

6262
CC= gcc
63-
CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM
63+
CFLAG= -O3
6464
DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS
6565
PEX_LIBS=
66-
EX_LIBS= -ldl
66+
EX_LIBS=
6767
EXE_EXT=
6868
ARFLAGS=
6969
AR= ar $(ARFLAGS) r
@@ -89,23 +89,23 @@ ASFLAG=$(CFLAG)
8989
PROCESSOR=
9090

9191
# CPUID module collects small commonly used assembler snippets
92-
CPUID_OBJ= x86_64cpuid.o
93-
BN_ASM= x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
94-
EC_ASM= ecp_nistz256.o ecp_nistz256-x86_64.o
92+
CPUID_OBJ= mem_clr.o
93+
BN_ASM= bn_asm.o
94+
EC_ASM=
9595
DES_ENC= des_enc.o fcrypt_b.o
96-
AES_ENC= aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
96+
AES_ENC= aes_core.o aes_cbc.o
9797
BF_ENC= bf_enc.o
9898
CAST_ENC= c_enc.o
99-
RC4_ENC= rc4-x86_64.o rc4-md5-x86_64.o
99+
RC4_ENC= rc4_enc.o rc4_skey.o
100100
RC5_ENC= rc5_enc.o
101-
MD5_ASM_OBJ= md5-x86_64.o
102-
SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
101+
MD5_ASM_OBJ=
102+
SHA1_ASM_OBJ=
103103
RMD160_ASM_OBJ=
104-
WP_ASM_OBJ= wp-x86_64.o
105-
CMLL_ENC= cmll-x86_64.o cmll_misc.o
106-
MODES_ASM_OBJ= ghash-x86_64.o aesni-gcm-x86_64.o
104+
WP_ASM_OBJ= wp_block.o
105+
CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
106+
MODES_ASM_OBJ=
107107
ENGINES_ASM_OBJ=
108-
PERLASM_SCHEME= elf
108+
PERLASM_SCHEME=
109109

110110
# KRB5 stuff
111111
KRB5_INCLUDES=
@@ -177,8 +177,8 @@ LIBS= libcrypto.a libssl.a
177177
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
178178
SHARED_SSL=libssl$(SHLIB_EXT)
179179
SHARED_LIBS=
180-
SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
181-
SHARED_LDFLAGS=-m64
180+
SHARED_LIBS_LINK_EXTS=
181+
SHARED_LDFLAGS=
182182

183183
GENERAL= Makefile
184184
BASENAME= openssl

deps/openssl/openssl/NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
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.2p and OpenSSL 1.0.2q [20 Nov 2018]
9+
10+
o Microarchitecture timing vulnerability in ECC scalar multiplication (CVE-2018-5407)
11+
o Timing vulnerability in DSA signature generation (CVE-2018-0734)
12+
813
Major changes between OpenSSL 1.0.2o and OpenSSL 1.0.2p [14 Aug 2018]
914

1015
o Client DoS due to large DH parameter (CVE-2018-0732)

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.2p 14 Aug 2018
2+
OpenSSL 1.0.2q 20 Nov 2018
33

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

0 commit comments

Comments
 (0)