aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/openssl/patches/160-disable_doc_tests.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-12-03 21:01:57 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-12-03 21:01:57 +0000
commit8116a8d3a9d501512118bff18fcdcf41e472ab0a (patch)
tree494f579664e19acd5e058f969fcdfedd287bffe0 /package/libs/openssl/patches/160-disable_doc_tests.patch
parent571910e8995cbfda06d3e1e82e5e3a155c17257c (diff)
downloadmaster-187ad058-8116a8d3a9d501512118bff18fcdcf41e472ab0a.tar.gz
master-187ad058-8116a8d3a9d501512118bff18fcdcf41e472ab0a.tar.bz2
master-187ad058-8116a8d3a9d501512118bff18fcdcf41e472ab0a.zip
openssl: update to version 1.0.2e
This fixes the following security problems: * CVE-2015-3193 * CVE-2015-3194 * CVE-2015-3195) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47726 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/openssl/patches/160-disable_doc_tests.patch')
-rw-r--r--package/libs/openssl/patches/160-disable_doc_tests.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libs/openssl/patches/160-disable_doc_tests.patch b/package/libs/openssl/patches/160-disable_doc_tests.patch
index f7c09b6174..274e5d0bbb 100644
--- a/package/libs/openssl/patches/160-disable_doc_tests.patch
+++ b/package/libs/openssl/patches/160-disable_doc_tests.patch
@@ -27,7 +27,7 @@
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -272,7 +272,7 @@ reflect:
+@@ -274,7 +274,7 @@ reflect:
sub_all: build_all
@@ -36,7 +36,7 @@
build_libs: build_libcrypto build_libssl openssl.pc
-@@ -529,7 +529,7 @@ dist:
+@@ -534,7 +534,7 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -47,7 +47,7 @@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
--- a/Makefile.org
+++ b/Makefile.org
-@@ -527,7 +527,7 @@ dist:
+@@ -532,7 +532,7 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)