Skip to contentSkip to conversation

dropbear: new feature: disable-weak-ciphers

PATCH In review Joseph Reynolds 3 participants 4 messages Jun 28, 2019 – Jul 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dropbear: new feature: disable-weak-ciphers

From 587a9e5c637ad3e70b8e35a3ca66013693ce7ac7 Mon Sep 17 00:00:00 2001
From: Joseph Reynolds <[email protected]>
Date: Wed, 19 Jun 2019 20:16:40 -0500
Subject: [PATCH v2] dropbear: new feature: disable-weak-ciphers

Enhances dropbear with a new feature "disable-weak-ciphers", on by default. This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers in the dropbear ssh server and client.

Disable this feature if you need to connect to the ssh server from older clients.  Additional customization can be done with local_options.h as usual.

Tested: On github.com/openbmc/openbmc using dropbear_2019.78.

---
 meta/recipes-core/dropbear/dropbear.inc            |  6 ++- .../0007-dropbear-disable-weak-ciphers.patch       | 57 ++++++++++++++++++++++

 2 files changed, 61 insertions(+), 2 deletions(-)

 create mode 100644 meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak-ciphers.patch

meta/recipes-core/dropbear/dropbear.inc +0 -0
index b74d186..a12ddb6 100644
@@ -20,7 +20,8 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \

            file://[email protected] \
            file://dropbear.socket \
            file://dropbear.default \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
+           ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+           ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://0007-dropbear-disable-weak-ciphers.patch', '', d)} "

 PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
                file://0006-dropbear-configuration-file.patch \
@@ -46,8 +47,9 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'

-PACKAGECONFIG ?= ""
+PACKAGECONFIG ?= "disable-weak-ciphers"
 PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" +PACKAGECONFIG[disable-weak-ciphers] = ""

 EXTRA_OECONF += "\
  ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"

meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak-cip renamed from meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak-ciphers.patch +0 -0

hers.patch
new file mode 100644
index 0000000..d1f5489

meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak-ciphers.patch new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.7.2
#1 lore raw

✗ patchtest: failure for dropbear: new feature: disable-weak-ciphers (rev2)

== Series Details ==

Series: dropbear: new feature: disable-weak-ciphers (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/18278/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format]
Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am
Diff line @@ -46,8 +47,9 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 148d54f91f)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Joseph Reynolds
Quoted 21 lines · Joseph Reynolds

From 587a9e5c637ad3e70b8e35a3ca66013693ce7ac7 Mon Sep 17 00:00:00
2001
From: Joseph Reynolds <[email protected]>
Date: Wed, 19 Jun 2019 20:16:40 -0500
Subject: [PATCH v2] dropbear: new feature: disable-weak-ciphers

Enhances dropbear with a new feature "disable-weak-ciphers", on by default.
This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers in
the dropbear ssh server and client.

Disable this feature if you need to connect to the ssh server from older
clients. Additional customization can be done with local_options.h as
usual.

Tested: On github.com/openbmc/openbmc using dropbear_2019.78.

Quoted 8 lines
---
  meta/recipes-core/dropbear/dropbear.inc            |  6 ++-
  .../0007-dropbear-disable-weak-ciphers.patch       | 57 
++++++++++++++++++++++
  2 files changed, 61 insertions(+), 2 deletions(-)

create mode 100644
meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak- ciphers.patch

I merged v1 of this patch previously. What was different in this version?

Also, the patch was still line wrapped so very hard to apply (had to be manually fixed).

Cheers,

Richard

#3 lore raw
Quoted 30 lines · Richard Purdie
Quoted 21 lines · Joseph Reynolds

From 587a9e5c637ad3e70b8e35a3ca66013693ce7ac7 Mon Sep 17 00:00:00
2001
From: Joseph Reynolds <[email protected]>
Date: Wed, 19 Jun 2019 20:16:40 -0500
Subject: [PATCH v2] dropbear: new feature: disable-weak-ciphers

Enhances dropbear with a new feature "disable-weak-ciphers", on by default.
This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers in
the dropbear ssh server and client.

Disable this feature if you need to connect to the ssh server from older
clients. Additional customization can be done with local_options.h as
usual.

Tested: On github.com/openbmc/openbmc using dropbear_2019.78.

Quoted 8 lines
---
   meta/recipes-core/dropbear/dropbear.inc            |  6 ++-
   .../0007-dropbear-disable-weak-ciphers.patch       | 57
++++++++++++++++++++++
   2 files changed, 61 insertions(+), 2 deletions(-)

create mode 100644
meta/recipes-core/dropbear/dropbear/0007-dropbear-disable-weak- ciphers.patch

Quoted 2 lines

I merged v1 of this patch previously. What was different in this version?

The v2 patch had the same content with fixed up commit messages. You can ignore it. Thanks for handling this.

Quoted 8 lines

Also, the patch was still line wrapped so very hard to apply (had to be manually fixed).

Cheers,

Richard