From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 13 Sep 2024 10:00:06 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sp1Dr-0042zg-0T for lore@lore.pengutronix.de; Fri, 13 Sep 2024 10:00:06 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sp1Dp-000736-8c for lore@pengutronix.de; Fri, 13 Sep 2024 10:00:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UWifL/f92ynoMmvfy4HPuHgpW8L7VS9fDyToX0OAQbQ=; b=dcxcshwb5klRAY82Dzbm9uqBOU w9wiKOND88vtSMNLiaC9VWqilnQcpLW66r2a1Cdp2hrymgH4lvdvdr3RIMuMjom70ODdOwyMcVNcZ WCn0nkCb4bq1T3zjlY4ocFsmhRIF8NxKuGp63EadSeWIYVQtQ1ahnzlZbpoSNercBUEaN4xBc/6WU nK6DLZ2c1RbHnAC1kSQsw79F+c9hi0A+ywWZ1xzYRrn/kPPul1+T0N62bzXHz8zIQU9ioz6KP24Ys 9bw0Lv2b3tgJmpMLbnW56fQaNjD0xHrjczB0XJX/Bi4qZctR78hnmktL4fVC3eFNRbdPIEzI5zehF i7dKeA5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp1DM-0000000FFr0-1FCQ; Fri, 13 Sep 2024 07:59:36 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp1DD-0000000FFlT-2gt9 for barebox@lists.infradead.org; Fri, 13 Sep 2024 07:59:30 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sp1DC-0006Yh-GD; Fri, 13 Sep 2024 09:59:26 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sp1DC-007Zaw-2Y; Fri, 13 Sep 2024 09:59:26 +0200 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1sp1DB-006w1Z-3B; Fri, 13 Sep 2024 09:59:26 +0200 From: Sascha Hauer To: Barebox List Date: Fri, 13 Sep 2024 09:59:15 +0200 Message-Id: <20240913075924.1652866-8-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240913075924.1652866-1-s.hauer@pengutronix.de> References: <20240913075924.1652866-1-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240913_005927_723389_171F5783 X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 07/16] keytoc: make key name hint optional X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The key name hint is used in barebox to find a key without iterating over all keys, but it's not required. Make the key name hint optional to keytoc. Signed-off-by: Sascha Hauer --- scripts/keytoc.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/scripts/keytoc.c b/scripts/keytoc.c index ecb33cbe47..85a7cd7319 100644 --- a/scripts/keytoc.c +++ b/scripts/keytoc.c @@ -9,6 +9,7 @@ * */ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#define _GNU_SOURCE #include #include #include @@ -602,9 +603,9 @@ static int gen_key(const char *keyname, const char *path) int main(int argc, char *argv[]) { - char *path, *keyname; int i, opt, ret; char *outfile = NULL; + int keynum = 1; outfilep = stdout; @@ -652,21 +653,33 @@ int main(int argc, char *argv[]) } for (i = optind; i < argc; i++) { - keyname = argv[i]; + char *keyspec = argv[i]; + char *keyname = NULL; + char *path, *freep = NULL; - path = strchr(keyname, ':'); - if (!path) { - fprintf(stderr, - "keys must be given as :\n"); - exit(1); + if (!strncmp(keyspec, "pkcs11:", 7)) { + path = keyspec; + } else { + path = strchr(keyspec, ':'); + if (path) { + *path = 0; + path++; + keyname = keyspec; + } else { + path = keyspec; + } } - *path = 0; - path++; + if (!keyname) { + asprintf(&freep, "key_%d", keynum++); + keyname = freep; + } ret = gen_key(keyname, path); if (ret) exit(1); + + free(freep); } if (dts) { -- 2.39.2