aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-01-20 12:49:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-01-20 12:49:54 +0000
commit555492e41a38ad5ca1fcffb0394c947b1a6b61d4 (patch)
tree9bc9e7a36bde49ebe4aa543017c80864339c70b4 /package
parentf0d73a4381b1f3a6f8714bfd46a62a515b4f53b0 (diff)
downloadupstream-555492e41a38ad5ca1fcffb0394c947b1a6b61d4.tar.gz
upstream-555492e41a38ad5ca1fcffb0394c947b1a6b61d4.tar.bz2
upstream-555492e41a38ad5ca1fcffb0394c947b1a6b61d4.zip
polarssl: patch CVE-2015-1182
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 44060
Diffstat (limited to 'package')
-rw-r--r--package/libs/polarssl/Makefile4
-rw-r--r--package/libs/polarssl/patches/300-CVE-2015-1182.patch11
2 files changed, 13 insertions, 2 deletions
diff --git a/package/libs/polarssl/Makefile b/package/libs/polarssl/Makefile
index 18e0f44fe9..384853e29c 100644
--- a/package/libs/polarssl/Makefile
+++ b/package/libs/polarssl/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011-2013 OpenWrt.org
+# Copyright (C) 2011-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=polarssl
PKG_VERSION:=1.3.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
diff --git a/package/libs/polarssl/patches/300-CVE-2015-1182.patch b/package/libs/polarssl/patches/300-CVE-2015-1182.patch
new file mode 100644
index 0000000000..5961d37aa5
--- /dev/null
+++ b/package/libs/polarssl/patches/300-CVE-2015-1182.patch
@@ -0,0 +1,11 @@
+--- a/library/asn1parse.c
++++ b/library/asn1parse.c
+@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char
+ if( cur->next == NULL )
+ return( POLARSSL_ERR_ASN1_MALLOC_FAILED );
+
++ memset( cur->next, 0, sizeof( asn1_sequence ) );
++
+ cur = cur->next;
+ }
+ }