From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 17 Oct 2023 16:55:41 +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.94.2) (envelope-from ) id 1qslTy-00BskA-0R for lore@lore.pengutronix.de; Tue, 17 Oct 2023 16:55:41 +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 1qslTw-0004KD-OK for lore@pengutronix.de; Tue, 17 Oct 2023 16:55:41 +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=vj2FL9/xRXPAFEhljMi8HjDPhxJBL7j6rWcKA21PurY=; b=2C4C/dEoUs++cpvAyki/i17iAG ofFQmQjZLsCLQru6fsGPt02VRWIYKdEbjErc8UuPp31UTbEP9ZP84kTawQweLOhinFSGePhKQBHeI nFlcY/BvgeWLFaekrU2aUbv9OA4u35G189OVmuMTfORaLG4HY8TuJePqOJZAPyElXi4Yt1M4Xvb29 dFBx+ulhhR0yFIXmXrNLpQtJqaTRYfMY7nAdySWheTTrDgYD4e2VJL+wR2nF++G4FLDdWH6rYDas1 EeL49kJ0dZ+ahAahAf3Vtjr/J76L6DZtVv5eHPZIjyTSf1AAiyTha8mwOXkRPlP9EOY6NAWmxtaaP b2CXgVVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qslSj-00Cf7G-18; Tue, 17 Oct 2023 14:54:25 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslQB-00CccB-2p for barebox@bombadil.infradead.org; Tue, 17 Oct 2023 14:51:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=vj2FL9/xRXPAFEhljMi8HjDPhxJBL7j6rWcKA21PurY=; b=O1Iuu9etK0dPyQLWcYBpyhKFWQ T578+RLyuczxzHwoVHt9TbVCZKbpdcoEHj1d5WlOZwbPPM9E90DJAFIsxsx05cJ7tPrO2fBbuHXbf 2JjxB9E574YsiD7z/SCdJeHZTn9kuHMn/vBbE5+MmQsPKzYeFEKt08cBIZg7eXJO4HK83Gsh9uNjy yK6G0L7EY99029aQ3TuRCiCx/TxHj3Ami5MVOsuK+HCri42kk5iBw4l914E+nWWrnLmzixz5jaIza oNmWb0hxCGRIRUWXyYbuVhXYd7bmpoYXQHuEWh5bdZHZJaHnGPbyGtMvPYwLg+ru3qS0ySe3497cG WBHmnQ5g==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslQ6-007AEl-01 for barebox@lists.infradead.org; Tue, 17 Oct 2023 14:51:46 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qslPz-0001wJ-9l for barebox@lists.infradead.org; Tue, 17 Oct 2023 16:51:35 +0200 From: Marco Felsch To: barebox@lists.infradead.org Date: Tue, 17 Oct 2023 16:51:28 +0200 Message-Id: <20231017145131.3069283-27-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017145131.3069283-1-m.felsch@pengutronix.de> References: <20231017145131.3069283-1-m.felsch@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-20231017_155142_291887_44E1DC1A X-CRM114-Status: GOOD ( 10.62 ) 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=-4.8 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 v2 26/29] scripts: imx-image: add support for CST_EXTRA_CMDLINE_OPTIONS 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) Add CST_EXTRA_CMDLINE_OPTIONS environment variable to allow build tools like PTXdist or Yocto to pass additional cst command line options. This becomes important for newer cst versions (> 3.3.1) since they support multiple backends: ssl (default) and pkcs11. Signed-off-by: Marco Felsch --- Changelog: v2: - unchaned - v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.felsch@pengutronix.de/T/#t scripts/imx/imx-image.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index 4a0a44b3a9b3..8a5768ca8b62 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -670,7 +670,7 @@ static int hab_sign(struct config_data *data, const char *csfcmds, int fd, outfd, ret, lockfd; char *csffile, *command; struct stat s; - char *cst; + char *cst, *cstopts; void *buf; size_t csf_space = CSF_LEN; unsigned int offset = 0; @@ -679,6 +679,10 @@ static int hab_sign(struct config_data *data, const char *csfcmds, if (!cst) cst = "cst"; + cstopts = getenv("CST_EXTRA_CMDLINE_OPTIONS"); + if (!cstopts) + cstopts = ""; + ret = asprintf(&csffile, "%s.slot%u.csfbin", data->outfile, csf_slot); if (ret < 0) exit(1); @@ -716,11 +720,11 @@ static int hab_sign(struct config_data *data, const char *csfcmds, if (ret == -1) return -EINVAL; else if (ret == 0) - ret = asprintf(&command, "%s -o %s -i /dev/stdin", - cst, csffile); + ret = asprintf(&command, "%s -o %s -i /dev/stdin %s", + cst, csffile, cstopts); else - ret = asprintf(&command, "%s -o %s;", - cst, csffile); + ret = asprintf(&command, "%s -o %s %s;", + cst, csffile, cstopts); if (ret < 0) return -ENOMEM; -- 2.39.2