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 7/8] dropbear: rc-once: Regenerate key if invalid key is found
Date: Fri, 5 Nov 2021 16:47:33 +0100 [thread overview]
Message-ID: <20211105154734.19983-8-ada@thorsis.com> (raw)
In-Reply-To: <20211105154734.19983-1-ada@thorsis.com>
Previously just existence of a key file was checked, which allowed
empty key files or invalid key files to persist. That would have
prevented dropbear server daemon startup.
Note: this does not always regenerate keys, only if rc-once is triggered
and run again for whatever reason.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
projectroot/etc/rc.once.d/dropbear | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/projectroot/etc/rc.once.d/dropbear b/projectroot/etc/rc.once.d/dropbear
index b1c40fdbb..8a0440624 100644
--- a/projectroot/etc/rc.once.d/dropbear
+++ b/projectroot/etc/rc.once.d/dropbear
@@ -8,7 +8,8 @@ gen_key() {
key_type=$1
key_file=$2
- [ -e "$key_file" ] && return
+ # do not overwrite valid key files
+ [ -s "$key_file" ] && dropbearkey -y -f "$key_file" > /dev/null 2>&1 && return
rm -f $key_file > /dev/null 2>&1
--
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-11-05 15:49 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 ` [ptxdist] [PATCH v3 6/8] dropbear: Support ecdsa keys in rc-once and init 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: rc-once: Regenerate key if invalid key is found 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-8-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