summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-29 13:58:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-07 08:52:55 +0100
commit7176d4d599f7ae7635face797fdf69dfa483c8ef (patch)
treea65ce7e9b687050b70a77e83fe480d2ee603cd65
parente68613e0b84b6fd8847e068c13e244805379b8d9 (diff)
downloadpoky-7176d4d599f7ae7635face797fdf69dfa483c8ef.tar.gz
dropbear: drop obsolete patch 0004-fix-2kb-keys.patch
The origins of the patch date back to early 2005 (prior to the start of git history in oe-core) to fix a hardcoded limit on the maximum size of remote host keys: http://familiar.handhelds.narkive.com/b1VGg2bI/problem-w-dropbear-ssh The hardcoded limit was fixed upstream in dropbear 0.47: https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d084e9e009de723ce The patch has therefore been obsolete since then. It went unnoticed until now as the patch has continued to apply - it modifies a value which is not used. (From OE-Core rev: 17072ffc1e765edd45bc1174378fb666185e5643) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc1
-rw-r--r--meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch19
2 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 16ac6442f8..a5dcab882b 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -14,7 +14,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
16 file://0001-urandom-xauth-changes-to-options.h.patch \ 16 file://0001-urandom-xauth-changes-to-options.h.patch \
17 file://0004-fix-2kb-keys.patch \
18 file://0007-fix-localoptions-search-path.patch \ 17 file://0007-fix-localoptions-search-path.patch \
19 file://init \ 18 file://init \
20 file://dropbearkey.service \ 19 file://dropbearkey.service \
diff --git a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
deleted file mode 100644
index 60c6a29d65..0000000000
--- a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Subject: [PATCH 4/6] fix 2kb keys
2
3Upstream-Status: Inappropriate [configuration]
4---
5 kex.h | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8Index: dropbear-2017.75/kex.h
9===================================================================
10--- dropbear-2017.75.orig/kex.h
11+++ dropbear-2017.75/kex.h
12@@ -106,6 +106,6 @@ int curve25519_donna(unsigned char *out,
13 #endif
14
15
16-#define MAX_KEXHASHBUF 2000
17+#define MAX_KEXHASHBUF 3000
18
19 #endif /* DROPBEAR_KEX_H_ */