summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-10-28 16:44:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-29 10:41:36 +0000
commit4a8d62ca86d7a8027afcb41a67a5a78183507b8c (patch)
treebe18943e44069b8f2a56ab9818adb47044fdf580 /meta/recipes-connectivity/openssh
parent9c01b3bf75b166d0fc8e1b794ff20aedd4fbfe42 (diff)
downloadpoky-4a8d62ca86d7a8027afcb41a67a5a78183507b8c.tar.gz
openssh: upgrade to 6.3p1
Removed the following backported patch(es): * mac.patch (From OE-Core rev: ce04ba6a5385ad2d021d472cf9236787c6ea7357) 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-6.2p2/mac.patch76
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/init (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/init)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/nostrip.patch (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/nostrip.patch)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/openssh-CVE-2011-4327.patch (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/openssh-CVE-2011-4327.patch)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/ssh_config (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/ssh_config)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/sshd (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/sshd.socket (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/sshd@.service (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/sshd_config (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd_config)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/sshdgenkeys.service (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.3p1/volatiles.99_sshd (renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.3p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_6.2p2.bb)6
12 files changed, 2 insertions, 80 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch b/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch
deleted file mode 100644
index 69fb69daeb..0000000000
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1[PATCH] force the MAC output to be 64-bit aligned
2
3Upstream-Status: Backport[anoncvs.mindrot.org/index.cgi/openssh/mac.c?r1=1.27&r2=1.28]
4
5Backport patch to fix segment fault due to unaligned memory access
6
7Wed Jun 5 22:12:37 2013 UTC (7 days, 3 hours ago) by dtucker
8Branch: MAIN
9CVS Tags: HEAD
10Changes since 1.27: +11 -8 lines
11Diff to previous 1.27
12
13 - dtucker@cvs.openbsd.org 2013/06/03 00:03:18
14 [mac.c]
15 force the MAC output to be 64-bit aligned so umac won't see
16unaligned
17 accesses on strict-alignment architectures. bz#2101, patch from
18 tomas.kuthan at oracle.com, ok djm@
19---
20 mac.c | 18 +++++++++++-------
21 1 file changed, 11 insertions(+), 7 deletions(-)
22
23diff --git a/mac.c b/mac.c
24index 3f2dc6f..a5a80d3 100644
25--- a/mac.c
26+++ b/mac.c
27@@ -152,12 +152,16 @@ mac_init(Mac *mac)
28 u_char *
29 mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
30 {
31- static u_char m[EVP_MAX_MD_SIZE];
32+ static union {
33+ u_char m[EVP_MAX_MD_SIZE];
34+ u_int64_t for_align;
35+ } u;
36+
37 u_char b[4], nonce[8];
38
39- if (mac->mac_len > sizeof(m))
40+ if (mac->mac_len > sizeof(u))
41 fatal("mac_compute: mac too long %u %lu",
42- mac->mac_len, (u_long)sizeof(m));
43+ mac->mac_len, (u_long)sizeof(u));
44
45 switch (mac->type) {
46 case SSH_EVP:
47@@ -166,22 +170,22 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
48 HMAC_Init(&mac->evp_ctx, NULL, 0, NULL);
49 HMAC_Update(&mac->evp_ctx, b, sizeof(b));
50 HMAC_Update(&mac->evp_ctx, data, datalen);
51- HMAC_Final(&mac->evp_ctx, m, NULL);
52+ HMAC_Final(&mac->evp_ctx, u.m, NULL);
53 break;
54 case SSH_UMAC:
55 put_u64(nonce, seqno);
56 umac_update(mac->umac_ctx, data, datalen);
57- umac_final(mac->umac_ctx, m, nonce);
58+ umac_final(mac->umac_ctx, u.m, nonce);
59 break;
60 case SSH_UMAC128:
61 put_u64(nonce, seqno);
62 umac128_update(mac->umac_ctx, data, datalen);
63- umac128_final(mac->umac_ctx, m, nonce);
64+ umac128_final(mac->umac_ctx, u.m, nonce);
65 break;
66 default:
67 fatal("mac_compute: unknown MAC type");
68 }
69- return (m);
70+ return (u.m);
71 }
72
73 void
74--
751.7.9.5
76
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.3p1/init
index e7f3971324..e7f3971324 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/init
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-6.3p1/nostrip.patch
index 33111f5494..33111f5494 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/nostrip.patch
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/nostrip.patch
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/openssh-CVE-2011-4327.patch b/meta/recipes-connectivity/openssh/openssh-6.3p1/openssh-CVE-2011-4327.patch
index 30c11cf432..30c11cf432 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/openssh-CVE-2011-4327.patch
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/openssh-CVE-2011-4327.patch
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/ssh_config b/meta/recipes-connectivity/openssh/openssh-6.3p1/ssh_config
index 4a4a649ba8..4a4a649ba8 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/ssh_config
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/ssh_config
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd
index 4882e58b48..4882e58b48 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd.socket
index d19ab2ac43..d19ab2ac43 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd.socket
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd@.service
index 64e009ff00..64e009ff00 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd@.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd_config b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd_config
index 4f9b626fbd..4f9b626fbd 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd_config
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshd_config
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshdgenkeys.service
index 2fd8a9aaf2..2fd8a9aaf2 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd b/meta/recipes-connectivity/openssh/openssh-6.3p1/volatiles.99_sshd
index 122320a719..122320a719 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
+++ b/meta/recipes-connectivity/openssh/openssh-6.3p1/volatiles.99_sshd
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.3p1.bb
index bb5c79eb5b..7dba6769b6 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.3p1.bb
@@ -7,7 +7,6 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10PR = "r0"
11 10
12DEPENDS = "zlib openssl" 11DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -25,7 +24,6 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
25 file://ssh_config \ 24 file://ssh_config \
26 file://init \ 25 file://init \
27 file://openssh-CVE-2011-4327.patch \ 26 file://openssh-CVE-2011-4327.patch \
28 file://mac.patch \
29 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 27 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
30 file://sshd.socket \ 28 file://sshd.socket \
31 file://sshd@.service \ 29 file://sshd@.service \
@@ -34,8 +32,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
34 32
35PAM_SRC_URI = "file://sshd" 33PAM_SRC_URI = "file://sshd"
36 34
37SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1" 35SRC_URI[md5sum] = "225e75c9856f76011966013163784038"
38SRC_URI[sha256sum] = "7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b" 36SRC_URI[sha256sum] = "aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420"
39 37
40inherit useradd update-rc.d update-alternatives systemd 38inherit useradd update-rc.d update-alternatives systemd
41 39