diff options
| author | Peter Wagner <tripolar@gmx.at> | 2017-11-10 00:35:35 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2017-11-13 00:53:35 +0100 |
| commit | cda8ec7dd84d5382a5cead01de568893cf0be833 (patch) | |
| tree | 0bf1132e8defe76e53937f262dca8605077623e6 /package/libs/openssl | |
| parent | 421754191dc8e5aa812e78f7b424893b6570ba93 (diff) | |
| download | upstream-cda8ec7dd84d5382a5cead01de568893cf0be833.tar.gz upstream-cda8ec7dd84d5382a5cead01de568893cf0be833.tar.bz2 upstream-cda8ec7dd84d5382a5cead01de568893cf0be833.zip | |
openssl: update to 1.0.2m
don't set no-ssl3-method when CONFIG_OPENSSL_WITH_SSL3 di disabled otherwise the compile breaks with this error:
../libssl.so: undefined reference to `SSLv3_client_method'
Fixes CVE: CVE-2017-3735, CVE-2017-3736
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Diffstat (limited to 'package/libs/openssl')
| -rw-r--r-- | package/libs/openssl/Makefile | 6 | ||||
| -rw-r--r-- | package/libs/openssl/patches/150-no_engines.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index b39e3c6d7a..2bf6a21e95 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.0.2 -PKG_BUGFIX:=k +PKG_BUGFIX:=m PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -23,7 +23,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_HASH:=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 +PKG_HASH:=8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE @@ -120,7 +120,7 @@ ifndef CONFIG_OPENSSL_WITH_EC2M endif ifndef CONFIG_OPENSSL_WITH_SSL3 - OPENSSL_OPTIONS += no-ssl3 no-ssl3-method + OPENSSL_OPTIONS += no-ssl3 endif ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT diff --git a/package/libs/openssl/patches/150-no_engines.patch b/package/libs/openssl/patches/150-no_engines.patch index 586d1f2935..1cb04bdabb 100644 --- a/package/libs/openssl/patches/150-no_engines.patch +++ b/package/libs/openssl/patches/150-no_engines.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -2128,6 +2128,11 @@ EOF +@@ -2130,6 +2130,11 @@ EOF close(OUT); } |