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

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

[Andre McCurdy]

This patch has been obsolete since 2005:

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 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

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 16ac644..a5dcab8 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)}"
 
 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 \
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 60c6a29..0000000
--- a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
+++ /dev/null
@@ -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

Re: [PATCH] dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

[Khem Raj]

On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> 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 ?

> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  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
>
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index 16ac644..a5dcab8 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)}"
>
>  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 \
> 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 60c6a29..0000000
> --- a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
> +++ /dev/null
> @@ -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
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH] dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

[Andre McCurdy]

On Tue, May 29, 2018 at 10:29 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>> 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.

Re: [PATCH] dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

[Richard Purdie]

On Tue, 2018-05-29 at 11:26 -0700, Andre McCurdy wrote:
> On Tue, May 29, 2018 at 10:29 AM, Khem Raj <raj.khem@gmail.com>
> wrote:
> > 
> > On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail.com
> > > 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).
> 
> 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

Re: [PATCH] dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

[Andre McCurdy]

On Tue, May 29, 2018 at 11:56 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2018-05-29 at 11:26 -0700, Andre McCurdy wrote:
>> On Tue, May 29, 2018 at 10:29 AM, Khem Raj <raj.khem@gmail.com>
>> wrote:
>> >
>> > On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail.com
>> > > 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).
>>
>> 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

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.

> so remote systems with 2048 length keys were somehow causing it
> problems?
>
> Cheers,
>
> Richard

Re: [PATCH] dropbear: drop obsolete patch 0004-fix-2kb-keys.patch

[Richard Purdie]

On Tue, 2018-05-29 at 12:09 -0700, Andre McCurdy wrote:
> On Tue, May 29, 2018 at 11:56 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > On Tue, 2018-05-29 at 11:26 -0700, Andre McCurdy wrote:
> > > 
> > > On Tue, May 29, 2018 at 10:29 AM, Khem Raj <raj.khem@gmail.com>
> > > wrote:
> > > > 
> > > > 
> > > > On Thu, May 24, 2018 at 7:27 PM, Andre McCurdy <armccurdy@gmail
> > > > .com
> > > > > 
> > > > > wrote:
> > > > > 
> > > > > This patch has been obsolete since 2005:
> > > > > 
> > > > >   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).
> > > 
> > > 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
> > 
> > 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