From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 Oct 2021 16:36:43 +0200 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 1mcTkp-0005nL-Hd for lore@lore.pengutronix.de; Mon, 18 Oct 2021 16:36:43 +0200 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 1mcTkp-0001vf-3Z; Mon, 18 Oct 2021 16:36:43 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mcTkI-0001Hd-Ak; Mon, 18 Oct 2021 16:36:11 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 6E1BA2A7A; Mon, 18 Oct 2021 16:36:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0JfjyvsfjTNG; Mon, 18 Oct 2021 16:36:09 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id 3CB9A2A80; Mon, 18 Oct 2021 16:36:09 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1mcTk2-0007Bp-LW; Mon, 18 Oct 2021 16:35:54 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Mon, 18 Oct 2021 16:35:50 +0200 Message-Id: <20211018143554.27573-5-ada@thorsis.com> In-Reply-To: <20211018143554.27573-1-ada@thorsis.com> References: <20211018143554.27573-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 4/8] 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: Denis Osterland-Heim , Michael Olbrich , Bruno Thomsen , Alexander Stein MIME-Version: 1.0 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 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 --- 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