diff options
| author |   Jackie Huang <jackie.huang@windriver.com> | 2014-08-18 03:05:02 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-21 21:35:07 +0200 |
| commit | 778ddba7010febf0b5c8029f09e83a3288eaa18b (patch) | |
| tree | 81ffc747848c4fe700ac484d7f3e1294a189414d /meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch | |
| parent | c73e26932dcbb8bbe1895ba969e0c41cd9bbf850 (diff) | |
| download | meta-openembedded-contrib-778ddba7010febf0b5c8029f09e83a3288eaa18b.tar.gz | |
strongswan: uprev to version 5.2.0
* removed two patches which were already integrated in 5.2.0:
strongswan-4.3.3-5.1.1_asn1_unwrap.patch
strongswan-5.0.0-5.1.2_reject_child_sa.patch
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch')
| -rw-r--r-- | meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch b/meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch deleted file mode 100644 index 374f2cfe69..0000000000 --- a/meta-networking/recipes-support/strongswan/files/strongswan-4.3.3-5.1.1_asn1_unwrap.patch +++ /dev/null @@ -1,28 +0,0 @@ -strongswan: asn1: Properly check length in asn1_unwrap() - -Fixes CVE-2014-2891 in strongSwan releases 4.3.3-5.1.1. - -Upstream-Status: Pending - -Signed-off-by: Yue Tao <yue.tao@windriver.com> - ---- - src/libstrongswan/asn1/asn1.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c -index d860ad9..9a5f5c5 100644 ---- a/src/libstrongswan/asn1/asn1.c -+++ b/src/libstrongswan/asn1/asn1.c -@@ -296,7 +296,7 @@ int asn1_unwrap(chunk_t *blob, chunk_t *inner) - else - { /* composite length, determine number of length octets */ - len &= 0x7f; -- if (len == 0 || len > sizeof(res.len)) -+ if (len == 0 || len > blob->len || len > sizeof(res.len)) - { - return ASN1_INVALID; - } --- -1.7.10.4 - |