mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] openssh: rc-once: Do not overwrite existing keys
Date: Fri, 26 Nov 2021 15:35:07 +0100	[thread overview]
Message-ID: <20211126143507.1207733-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211105154734.19983-9-ada@thorsis.com>

Thanks, applied as ac33521e077e313ad9c67a4ca2c8bf44de34cbc2.

Michael

[sent from post-receive hook]

On Fri, 26 Nov 2021 15:35:06 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> When storing your keys not in rootfs but on a separate data partition
> (using symbolic links or overlay fs), keys are overwritten on each
> firmware upgrade which lets rc-once run again (which happens when using
> opkg upgrade/update or RAUC in an A/B scheme for example).
> 
> Changing keys are at best annoying, but may be interpreted as an attack
> as well.
> 
> Note: if an empty or invalid key is found, the key is still regenerated.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211105154734.19983-9-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/rc.once.d/openssh b/projectroot/etc/rc.once.d/openssh
> index 545586f07629..717d6457eeb3 100644
> --- a/projectroot/etc/rc.once.d/openssh
> +++ b/projectroot/etc/rc.once.d/openssh
> @@ -27,6 +27,7 @@ create_keys() {
>  	hostkeys="$(get_hostkeys)" || return
>  
>  	for keyfile in $hostkeys; do
> +		[ -s "$keyfile" ] && ssh-keygen -l -f "${keyfile}.pub" > /dev/null && continue
>  		create_key "$keyfile" || return
>  	done
>  }

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


      reply	other threads:[~2021-11-26 14:35 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 ` [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   ` Michael Olbrich [this message]

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=20211126143507.1207733-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ada@thorsis.com \
    --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