Skip to contentSkip to conversation

dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

PATCH In review Andre McCurdy 1 participant 2 messages May 29, 2018 – Jun 4, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 meta/recipes-core/dropbear/dropbear.inc               |  1 -
 .../dropbear/dropbear/0004-fix-2kb-keys.patch         | 19 -------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
meta/recipes-core/dropbear/dropbear.inc +0 -1
index 16ac644..a5dcab8 100644
@@ -14,7 +14,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://0001-urandom-xauth-changes-to-options.h.patch \
-           file://0004-fix-2kb-keys.patch \
            file://0007-fix-localoptions-search-path.patch \
            file://init \
            file://dropbearkey.service \
meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch deleted +0 -19
deleted file mode 100644
index 60c6a29..0000000
@@ -1,19 +0,0 @@
-Subject: [PATCH 4/6] fix 2kb keys
-
-Upstream-Status: Inappropriate [configuration]
----
- kex.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dropbear-2017.75/kex.h
-===================================================================
---- dropbear-2017.75.orig/kex.h
-+++ dropbear-2017.75/kex.h
-@@ -106,6 +106,6 @@ int curve25519_donna(unsigned char *out,
- #endif
- 
- 
--#define MAX_KEXHASHBUF 2000
-+#define MAX_KEXHASHBUF 3000
- 
- #endif /* DROPBEAR_KEX_H_ */
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · Andre McCurdy

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

Quoted 7 lines

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.

Ping.

Does the commit message now have enough detail?

Quoted 47 lines
---
 meta/recipes-core/dropbear/dropbear.inc               |  1 -
 .../dropbear/dropbear/0004-fix-2kb-keys.patch         | 19 -------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
meta/recipes-core/dropbear/dropbear.inc +0 -1
index 16ac644..a5dcab8 100644
@@ -14,7 +14,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://0001-urandom-xauth-changes-to-options.h.patch \
-           file://0004-fix-2kb-keys.patch \
            file://0007-fix-localoptions-search-path.patch \
            file://init \
            file://dropbearkey.service \
meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch deleted +0 -20
deleted file mode 100644
index 60c6a29..0000000
@@ -1,19 +0,0 @@
-Subject: [PATCH 4/6] fix 2kb keys
-
-Upstream-Status: Inappropriate [configuration]
----
- kex.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dropbear-2017.75/kex.h
-===================================================================
---- dropbear-2017.75.orig/kex.h
-+++ dropbear-2017.75/kex.h
-@@ -106,6 +106,6 @@ int curve25519_donna(unsigned char *out,
- #endif
-
-
--#define MAX_KEXHASHBUF 2000
-+#define MAX_KEXHASHBUF 3000
-
- #endif /* DROPBEAR_KEX_H_ */
--

1.9.1