From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k41gY-0007uS-RI for ptxdist@pengutronix.de; Fri, 07 Aug 2020 14:41:22 +0200 Received: from mol by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1k41gY-0006mC-IP for ptxdist@pengutronix.de; Fri, 07 Aug 2020 14:41:22 +0200 Date: Fri, 7 Aug 2020 14:41:22 +0200 From: Michael Olbrich Message-ID: <20200807124122.GB12358@pengutronix.de> References: <20200807091604.22777-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200807091604.22777-1-u.kleine-koenig@pengutronix.de> Subject: Re: [ptxdist] [PATCH] openssh/rc-once: deduplicate some function parameters List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de On Fri, Aug 07, 2020 at 11:16:04AM +0200, Uwe Kleine-K=F6nig wrote: > The create_keys() function passed the key type three times. Now it's > only passed once. While at it also use the shell builtin case instead of > echo | grep to find the needed keys. > = > The only visible change is that the end message message changes from > = > Creating RSA key; done. > = > to > = > Created RSA key. > = > Signed-off-by: Uwe Kleine-K=F6nig > --- > Hello, > = > I noticed this "triplication" while updating a BSP and merging in some > BSP specific features. I guess it is subjective if you consider this an > improvement, so judge freely if you want it in ptxdist or not. > = > Best regards > Uwe > = > projectroot/etc/rc.once.d/openssh | 35 +++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 16 deletions(-) > = > diff --git a/projectroot/etc/rc.once.d/openssh b/projectroot/etc/rc.once.= d/openssh > index 4a3c594cc3ae..813e7c620e49 100644 > --- a/projectroot/etc/rc.once.d/openssh > +++ b/projectroot/etc/rc.once.d/openssh > @@ -18,32 +18,35 @@ host_keys_required() { > } > = > create_key() { > - msg=3D"$1" > + _type=3D"$1" > + prettytype=3D"$(echo $_type | tr a-z A-Z)" > shift > hostkeys=3D"$1" > shift > - file=3D"$1" > - shift > = > - if echo "$hostkeys" | grep -x "$file" >/dev/null; then > - echo "$msg; this may take some time ..." > + file=3D"/etc/ssh/ssh_host_${_type}_key" > + > + case " > +$hostkeys > +" in > + *" > +$file > +"*) This looks quite strange. Maybe: case " $(echo $hostkeys) " in *" $file "*) Michael > + echo "Create $prettytype key; this may take some time ..." > rm -f $file && > - ssh-keygen -q -f "$file" -N '' "$@" || return > - echo "$msg; done." > - fi > + ssh-keygen -q -f "$file" -N '' -t "$_type" "$@" || return > + echo "Created $prettytype key." > + ;; > + esac > } > = > create_keys() { > hostkeys=3D"$(host_keys_required)" > = > - create_key "Creating DSA key" \ > - "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa && > - create_key "Creating ECDSA key" \ > - "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa && > - create_key "Creating ED25519 key" \ > - "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519 && > - create_key "Creating RSA key" \ > - "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa -b 4096 > + create_key "dsa" "$hostkeys" && > + create_key "ecdsa" "$hostkeys" && > + create_key "ed25519" "$hostkeys" && > + create_key "rsa" "$hostkeys" -b 4096 > } > = > if ! create_keys; then > -- = > 2.28.0 > = > = > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request= @pengutronix.de -- = Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@p= engutronix.de