diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-05-23 16:09:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 14:14:49 +0100 |
commit | 676fd3f394a0c0576b63c77ed2184bf5f42c29b6 (patch) | |
tree | a08df1371f84ac25b659d7f6c72d537875bb3252 /meta/recipes-core/dropbear/dropbear.inc | |
parent | 0d32c3485aa017c15281d24d5deac7710bf32802 (diff) | |
download | poky-676fd3f394a0c0576b63c77ed2184bf5f42c29b6.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 rev: 8f5bc47729edb8cb051d81e9ff1680cb8d2eca25)
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.inc | 3 |
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" | |||
2 | HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" | 2 | HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" |
3 | SECTION = "console/network" | 3 | SECTION = "console/network" |
4 | 4 | ||
5 | INC_PR = "r0" | 5 | INC_PR = "r1" |
6 | 6 | ||
7 | # some files are from other projects and have others license terms: | 7 | # some files are from other projects and have others license terms: |
8 | # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY | 8 | # 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 \ | |||
19 | file://0002-static_build_fix.patch \ | 19 | file://0002-static_build_fix.patch \ |
20 | file://0003-configure.patch \ | 20 | file://0003-configure.patch \ |
21 | file://0004-fix-2kb-keys.patch \ | 21 | file://0004-fix-2kb-keys.patch \ |
22 | file://0007-dropbear-fix-for-x32-abi.patch \ | ||
22 | file://init \ | 23 | file://init \ |
23 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " | 24 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " |
24 | 25 | ||