diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-11-19 08:53:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-20 14:08:57 +0000 |
| commit | 45206510ab48bfee6e183f698f963fea8f03e2a5 (patch) | |
| tree | 578681c0e06681b1ecc121c5f6e8386d8c2491b4 /meta/recipes-connectivity/openssh | |
| parent | 132f90b9bad068fc28c4b262c3b1dbd3e37a9169 (diff) | |
| download | openembedded-core-45206510ab48bfee6e183f698f963fea8f03e2a5.tar.gz openembedded-core-45206510ab48bfee6e183f698f963fea8f03e2a5.tar.bz2 openembedded-core-45206510ab48bfee6e183f698f963fea8f03e2a5.zip | |
openssh: drop already applied patch
This patch was part of the 6.6p1 release.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 1 |
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 3deaf3f0e9..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Backport - -Fix for CVE-2014-2532 - -Backported from openssh-6.6p1.tar.gz - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- ---- a/session.c -+++ b/session.c -@@ -955,6 +955,11 @@ - u_int envsize; - u_int i, namelen; - -+ if (strchr(name, '=') != NULL) { -+ error("Invalid environment variable \"%.100s\"", name); -+ return; -+ } -+ - /* - * If we're passed an uninitialized list, allocate a single null - * entry before continuing. diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb index 047a895aae..edae0368f9 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. file://volatiles.99_sshd \ file://add-test-support-for-busybox.patch \ file://run-ptest \ - file://openssh-CVE-2014-2532.patch \ file://openssh-CVE-2014-2653.patch \ file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch" |