From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 Oct 2021 16:37:11 +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 1mcTlH-0005pw-K6 for lore@lore.pengutronix.de; Mon, 18 Oct 2021 16:37:11 +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 1mcTlH-0002jf-Al; Mon, 18 Oct 2021 16:37:11 +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 1mcTkN-0001LE-QX; Mon, 18 Oct 2021 16:36:16 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 07DC71CBD; Mon, 18 Oct 2021 16:36:15 +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 4XrpH6WyIIjr; Mon, 18 Oct 2021 16:36:14 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id C7EEB13C; Mon, 18 Oct 2021 16:36:14 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1mcTk2-0007By-O4; Mon, 18 Oct 2021 16:35:54 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Mon, 18 Oct 2021 16:35:53 +0200 Message-Id: <20211018143554.27573-8-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=-1.6 required=4.0 tests=AWL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 7/8] dropbear: rc-once: Regenerate key if invalid key is found 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 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 --- 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 bfebccfc4..f716bd6ac 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