mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Denis Osterland-Heim <denis.osterland@diehl.com>,
	Michael Olbrich <m.olbrich@pengutronix.de>,
	Bruno Thomsen <bruno.thomsen@gmail.com>,
	Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [ptxdist] [PATCH v3 6/8] dropbear: Support ecdsa keys in rc-once and init
Date: Fri,  5 Nov 2021 16:47:32 +0100	[thread overview]
Message-ID: <20211105154734.19983-7-ada@thorsis.com> (raw)
In-Reply-To: <20211105154734.19983-1-ada@thorsis.com>

With 54afea33423c ("dropbear: Added Elliptic Curve Cryptography
options.") an option was added to built with ecdsa host key support, but
scripts where not adapted back then.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---

Notes:
    v2 -> v3
    --------
    - adapted to DSS key support removal
    - stick to one syntax (M. Olbrich)

 projectroot/etc/init.d/dropbear      | 3 +++
 projectroot/etc/rc.once.d/dropbear   | 3 +++
 projectroot/usr/lib/init/dropbear.sh | 1 +
 3 files changed, 7 insertions(+)

diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
index 4dda9aaf7..2039340b2 100644
--- a/projectroot/etc/init.d/dropbear
+++ b/projectroot/etc/init.d/dropbear
@@ -22,6 +22,9 @@ dropbear_start() {
             rsa)
                 test -f "$DROPBEAR_RSAKEY" && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
                 ;;
+            ecdsa)
+                test -f "$DROPBEAR_ECDSAKEY" && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_ECDSAKEY"
+                ;;
             *)
                 echo "Key type '$keytype' not supported"
                 ;;
diff --git a/projectroot/etc/rc.once.d/dropbear b/projectroot/etc/rc.once.d/dropbear
index 0735fed38..b1c40fdbb 100644
--- a/projectroot/etc/rc.once.d/dropbear
+++ b/projectroot/etc/rc.once.d/dropbear
@@ -30,6 +30,9 @@ gen_keys() {
 			rsa)
 				gen_key rsa "$DROPBEAR_RSAKEY"
 				;;
+			ecdsa)
+				gen_key ecdsa "$DROPBEAR_ECDSAKEY"
+				;;
 			*)
 				echo "Key type '$keytype' not supported"
 				;;
diff --git a/projectroot/usr/lib/init/dropbear.sh b/projectroot/usr/lib/init/dropbear.sh
index f4a083b8c..12fd6e5ce 100644
--- a/projectroot/usr/lib/init/dropbear.sh
+++ b/projectroot/usr/lib/init/dropbear.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 DROPBEAR_RSAKEY='@KEYDIR@/dropbear_rsa_host_key'
+DROPBEAR_ECDSAKEY='@KEYDIR@/dropbear_ecdsa_host_key'
 DROPBEAR_KEYTYPES='@KEYTYPES@'
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


  parent reply	other threads:[~2021-11-05 15:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-05 15:47 [ptxdist] [PATCH v3 0/8] rc-once: Improve re-generation of keys Alexander Dahl
2021-11-05 15:47 ` [ptxdist] [PATCH v3 1/8] dropbear: Remove host/public key DSS support Alexander Dahl
2021-11-26 14:34   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 2/8] dropbear: Move targetinstall of rc-once script Alexander Dahl
2021-11-26 14:34   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 3/8] dropbear: Move shell variables to new common shell lib Alexander Dahl
2021-11-26 14:35   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 4/8] dropbear: Move KEYTYPES to shell lib and set based on menu Alexander Dahl
2021-11-26 14:35   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 5/8] dropbear: Refactor rc-once and init to use KEYTYPES Alexander Dahl
2021-11-26 14:35   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` Alexander Dahl [this message]
2021-11-26 14:35   ` [ptxdist] [APPLIED] dropbear: Support ecdsa keys in rc-once and init Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 7/8] dropbear: rc-once: Regenerate key if invalid key is found Alexander Dahl
2021-11-26 14:35   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 8/8] openssh: rc-once: Do not overwrite existing keys Alexander Dahl
2021-11-26 14:35   ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211105154734.19983-7-ada@thorsis.com \
    --to=ada@thorsis.com \
    --cc=alexander.stein@systec-electronic.com \
    --cc=bruno.thomsen@gmail.com \
    --cc=denis.osterland@diehl.com \
    --cc=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox