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-05-24 14:14:30 +0100
commit8f5bc47729edb8cb051d81e9ff1680cb8d2eca25 (patch)
treed7010472169d49a336dc007816427d06c194c545 /meta/recipes-core/dropbear/dropbear.inc
parentea6a8c9b0dee89b0b25d341ac57666cf090d6ed3 (diff)
downloadopenembedded-core-contrib-8f5bc47729edb8cb051d81e9ff1680cb8d2eca25.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] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 9864ae8186..be93d60595 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation"
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
SECTION = "console/network"
-INC_PR = "r0"
+INC_PR = "r1"
# some files are from other projects and have others license terms:
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
@@ -19,6 +19,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://0002-static_build_fix.patch \
file://0003-configure.patch \
file://0004-fix-2kb-keys.patch \
+ file://0007-dropbear-fix-for-x32-abi.patch \
file://init \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "