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 v2 4/8] dropbear: Move KEYTYPES to shell lib and set based on menu
Date: Mon, 18 Oct 2021 16:35:50 +0200 [thread overview]
Message-ID: <20211018143554.27573-5-ada@thorsis.com> (raw)
In-Reply-To: <20211018143554.27573-1-ada@thorsis.com>
The variable is currently not used, but it will be useful later for key
generation and daemon startup based on actually selected host key types.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
projectroot/etc/init.d/dropbear | 2 --
projectroot/usr/lib/init/dropbear.sh | 1 +
rules/dropbear.make | 9 +++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
index a308aefde..342565f93 100644
--- a/projectroot/etc/init.d/dropbear
+++ b/projectroot/etc/init.d/dropbear
@@ -13,8 +13,6 @@ DROPBEAR_EXTRA_ARGS=
test -z "$DROPBEAR_BANNER" || \
DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
-test -n "$DROPBEAR_KEYTYPES" || \
- DROPBEAR_KEYTYPES="rsa dss"
dropbear_start() {
diff --git a/projectroot/usr/lib/init/dropbear.sh b/projectroot/usr/lib/init/dropbear.sh
index 2e3d60f49..e8aa58576 100644
--- a/projectroot/usr/lib/init/dropbear.sh
+++ b/projectroot/usr/lib/init/dropbear.sh
@@ -2,3 +2,4 @@
DROPBEAR_RSAKEY='@KEYDIR@/dropbear_rsa_host_key'
DROPBEAR_DSSKEY='@KEYDIR@/dropbear_dss_host_key'
+DROPBEAR_KEYTYPES='@KEYTYPES@'
diff --git a/rules/dropbear.make b/rules/dropbear.make
index ce0214d88..bbf99eb14 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -261,6 +261,13 @@ DROPBEAR_INSTALL_OPT := install inst_scp
# Target-Install
# ----------------------------------------------------------------------------
+ifdef PTXCONF_DROPBEAR_RSA
+DROPBEAR_KEY_TYPES += rsa
+endif
+ifdef PTXCONF_DROPBEAR_ECDSA
+DROPBEAR_KEY_TYPES += ecdsa
+endif
+
$(STATEDIR)/dropbear.targetinstall:
@$(call targetinfo)
@@ -273,6 +280,8 @@ $(STATEDIR)/dropbear.targetinstall:
@$(call install_alternative, dropbear, 0, 0, 0644, /usr/lib/init/dropbear.sh)
@$(call install_replace, dropbear, /usr/lib/init/dropbear.sh, \
@KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR))
+ @$(call install_replace, dropbear, /usr/lib/init/dropbear.sh, \
+ @KEYTYPES@, '$(DROPBEAR_KEY_TYPES)')
ifdef PTXCONF_DROPBEAR_DROPBEAR
@$(call install_copy, dropbear, 0, 0, 0755, -, \
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-10-18 14:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 14:35 [ptxdist] [PATCH v2 0/8] rc-once: Improve re-generation of keys Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 1/8] dropbear: Adapt menu comment to available options Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 2/8] dropbear: Move targetinstall of rc-once script Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 3/8] dropbear: Move shell variables to new common shell lib Alexander Dahl
2021-10-18 14:35 ` Alexander Dahl [this message]
2021-10-18 14:35 ` [ptxdist] [PATCH v2 5/8] dropbear: Refactor rc-once and init to use KEYTYPES Alexander Dahl
2021-10-22 8:44 ` Michael Olbrich
2021-10-22 9:05 ` Alexander Dahl
2021-10-28 5:49 ` Michael Olbrich
2021-10-18 14:35 ` [ptxdist] [PATCH v2 6/8] dropbear: Support ecdsa keys in rc-once and init Alexander Dahl
2021-10-22 8:47 ` Michael Olbrich
2021-10-18 14:35 ` [ptxdist] [PATCH v2 7/8] dropbear: rc-once: Regenerate key if invalid key is found Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 8/8] openssh: rc-once: Do not overwrite existing keys Alexander Dahl
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=20211018143554.27573-5-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