summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear/dropbear.inc
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-05-23 16:09:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-03 16:58:12 +0100
commit66b99274efc0b2d0dcca9297326049d23068e733 (patch)
tree4717261ba3f59730790bbff9dfa8d07dec86899a /meta/recipes-core/dropbear/dropbear.inc
parentd78df944e71950d65319fe1fe9f17b0510bb7be0 (diff)
downloadpoky-66b99274efc0b2d0dcca9297326049d23068e733.tar.gz
dropbear: a fix for hang in dropbearkey, built for x32
This commit fixes runtime hang of 'dropbearkey' utility, built for a x32 target abi system. The hang was observed while generating ssh keys, with this command: dropbearkey -t dss -f private The issue is fixed by changing the code, where 'long' in x86_64 mode is assumed as 64bit quantity. With the x32 abi, the processor is in x86_64 mode, but the 'long' is a 32bit quantity. Hence the fix uses 'long long' instead of 'long' to define/access 64bit data variables. Fixes bug: [YOCTO #4496] (From OE-Core master rev: 8f5bc47729edb8cb051d81e9ff1680cb8d2eca25) (From OE-Core rev: 4f6d55123fe054e8d081722b91aa12d676b42cb3) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 8d94e5bb22..e0d15e674a 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -20,6 +20,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
20 file://configure.patch \ 20 file://configure.patch \
21 file://fix-2kb-keys.patch \ 21 file://fix-2kb-keys.patch \
22 file://nopw-option.patch \ 22 file://nopw-option.patch \
23 file://0007-dropbear-fix-for-x32-abi.patch \
23 file://init \ 24 file://init \
24 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " 25 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
25 26