summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-11-19 08:53:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:09:02 (GMT)
commit4d6772706c6188be7157a5a1160e23ab8a0e313d (patch)
tree3dc3d94397ac24ec3a37ba64235afb03cf709cd3 /meta
parentbc41835eee78e4c30e715f99576ef3006e8132d1 (diff)
downloadpoky-4d6772706c6188be7157a5a1160e23ab8a0e313d.tar.gz
openssh: drop already applied patch
This patch was part of the 6.6p1 release. (From OE-Core rev: 45206510ab48bfee6e183f698f963fea8f03e2a5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch22
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb1
2 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch
deleted file mode 100644
index 3deaf3f..0000000
--- a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Backport
2
3Fix for CVE-2014-2532
4
5Backported from openssh-6.6p1.tar.gz
6
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8---
9--- a/session.c
10+++ b/session.c
11@@ -955,6 +955,11 @@
12 u_int envsize;
13 u_int i, namelen;
14
15+ if (strchr(name, '=') != NULL) {
16+ error("Invalid environment variable \"%.100s\"", name);
17+ return;
18+ }
19+
20 /*
21 * If we're passed an uninitialized list, allocate a single null
22 * entry before continuing.
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index 047a895..edae036 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
@@ -23,7 +23,6 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
23 file://volatiles.99_sshd \ 23 file://volatiles.99_sshd \
24 file://add-test-support-for-busybox.patch \ 24 file://add-test-support-for-busybox.patch \
25 file://run-ptest \ 25 file://run-ptest \
26 file://openssh-CVE-2014-2532.patch \
27 file://openssh-CVE-2014-2653.patch \ 26 file://openssh-CVE-2014-2653.patch \
28 file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch" 27 file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch"
29 28