Skip to contentSkip to conversation

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

PATCH Superseded Andre McCurdy 3 participants 6 messages May 25, 2018 – May 29, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

This patch has been obsolete since 2005:

https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d084e9e009de723ce

---
 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 4 lines · Andre McCurdy

This patch has been obsolete since 2005:

https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d084e9e009de723ce

Seems fine to drop but I would like to understand why we carried it thus far. What is the history of it in OE ?

Quoted 52 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

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw
Quoted 7 lines · Khem Raj
Quoted 3 lines · Andre McCurdy

This patch has been obsolete since 2005:

https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d084e9e009de723ce

Seems fine to drop but I would like to understand why we carried it thus far. What is the history of it in OE ?

It's older than the git history in oe-core (ie it was added in August 2005 as part of the first commit to oe-core).

The patch looks like it was initially created in March 2005 against dropbear 0.45.

In 2011 someone (incorrectly) added a tag "Upstream-Status:
Inappropriate [configuration]".

That's about as much history as we have.

#3 lore raw
Quoted 16 lines · Andre McCurdy
Quoted 11 lines · Khem Raj

On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <[email protected]

Quoted 6 lines

wrote:

This patch has been obsolete since 2005:

  https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d
084e9e009de723ce

Seems fine to drop but I would like to understand why we carried it thus far.
What is the history of it in OE ?

It's older than the git history in oe-core (ie it was added in August 2005 as part of the first commit to oe-core).

Quoted 7 lines

The patch looks like it was initially created in March 2005 against dropbear 0.45.

In 2011 someone (incorrectly) added a tag "Upstream-Status:
Inappropriate [configuration]".

That's about as much history as we have.

Looks like it was added for 0.44:

http://git.openembedded.org/openembedded/commit/packages/dropbear?id=ed6e40d6aff6cffabeff6f7fd6a9fee062566b2c

and there was some associated discussion:

http://familiar.handhelds.narkive.com/b1VGg2bI/problem-w-dropbear-ssh

so remote systems with 2048 length keys were somehow causing it problems?

Cheers,

Richard

#4 lore raw
Quoted 25 lines · Richard Purdie
Quoted 16 lines · Andre McCurdy
Quoted 11 lines · Khem Raj

On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <[email protected]

Quoted 6 lines

wrote:

This patch has been obsolete since 2005:

https://github.com/mkj/dropbear/commit/736f370dce614b717193f45d
084e9e009de723ce

Seems fine to drop but I would like to understand why we carried it thus far.
What is the history of it in OE ?

It's older than the git history in oe-core (ie it was added in August 2005 as part of the first commit to oe-core).

Quoted 7 lines

The patch looks like it was initially created in March 2005 against dropbear 0.45.

In 2011 someone (incorrectly) added a tag "Upstream-Status:
Inappropriate [configuration]".

That's about as much history as we have.

Quoted 7 lines

Looks like it was added for 0.44:

http://git.openembedded.org/openembedded/commit/packages/dropbear?id=ed6e40d6aff6cffabeff6f7fd6a9fee062566b2c

and there was some associated discussion:

http://familiar.handhelds.narkive.com/b1VGg2bI/problem-w-dropbear-ssh

That discussion ends with Matt Johnston (the dropbear author) saying he will make a change in the next release to set the key size at run-time rather than relying on a hardcoded maximum... which is exactly what he did.

Quoted 6 lines

so remote systems with 2048 length keys were somehow causing it problems?

Cheers,

Richard

#5 lore raw
Quoted 40 lines · Andre McCurdy
Quoted 38 lines · Richard Purdie
Quoted 23 lines · Andre McCurdy
Quoted 9 lines · Khem Raj

On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail .com

Quoted 5 lines

wrote:

This patch has been obsolete since 2005:

Quoted 7 lines
Quoted 3 lines

  https://github.com/mkj/dropbear/commit/736f370dce614b717193
f45d
084e9e009de723ce

Seems fine to drop but I would like to understand why we carried it
thus far.
What is the history of it in OE ?

It's older than the git history in oe-core (ie it was added in August
2005 as part of the first commit to oe-core).

Quoted 8 lines

The patch looks like it was initially created in March 2005 against
dropbear 0.45.

In 2011 someone (incorrectly) added a tag "Upstream-Status:
Inappropriate [configuration]".

That's about as much history as we have.

Looks like it was added for 0.44:

http://git.openembedded.org/openembedded/commit/packages/dropbear?i
d=ed6e40d6aff6cffabeff6f7fd6a9fee062566b2c

Quoted 8 lines
Quoted 4 lines

and there was some associated discussion:

http://familiar.handhelds.narkive.com/b1VGg2bI/problem-w-dropbear-s
sh

That discussion ends with Matt Johnston (the dropbear author) saying he will make a change in the next release to set the key size at run-time rather than relying on a hardcoded maximum... which is exactly what he did.

Right, it makes sense when you dig into it. Could you summarise some of this into the commit message removing the patch please? (including noting it wasn't needed since dropbear 0.47 due to the fix upstream but that the patch happened to continue to apply to the code).

Cheers,

Richard