From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 26 Nov 2021 15:35:14 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mqcJm-00049B-6X for lore@lore.pengutronix.de; Fri, 26 Nov 2021 15:35:14 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mqcJl-0005R0-Ay; Fri, 26 Nov 2021 15:35:13 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqcJb-00051d-Pw; Fri, 26 Nov 2021 15:35:03 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1mqcJb-001Bui-O3; Fri, 26 Nov 2021 15:35:03 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1mqcJZ-0053Sp-R7; Fri, 26 Nov 2021 15:35:01 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 26 Nov 2021 15:35:01 +0100 Message-Id: <20211126143501.1204886-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105154734.19983-5-ada@thorsis.com> References: <20211105154734.19983-5-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] dropbear: Move KEYTYPES to shell lib and set based on menu X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 377f4c01cc541fcef039332ec1abf028b2b8bbea. Michael [sent from post-receive hook] On Fri, 26 Nov 2021 15:35:01 +0100, Alexander Dahl wrote: > 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 > Message-Id: <20211105154734.19983-5-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear > index b394eab1548f..15671c9d8a22 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" > > dropbear_start() { > > diff --git a/projectroot/usr/lib/init/dropbear.sh b/projectroot/usr/lib/init/dropbear.sh > index 7b94429b4781..f4a083b8cc01 100644 > --- a/projectroot/usr/lib/init/dropbear.sh > +++ b/projectroot/usr/lib/init/dropbear.sh > @@ -1,3 +1,4 @@ > #!/bin/sh > > DROPBEAR_RSAKEY='@KEYDIR@/dropbear_rsa_host_key' > +DROPBEAR_KEYTYPES='@KEYTYPES@' > diff --git a/rules/dropbear.make b/rules/dropbear.make > index bdf855fe388d..102825ed6ab4 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -264,6 +264,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) > > @@ -276,6 +283,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, -, \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de