From patchwork Fri Jun 16 11:34:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1795866 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=SB7XazmW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QjHCC032bz20X8 for ; Fri, 16 Jun 2023 21:35:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AB8C8624A; Fri, 16 Jun 2023 13:34:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="SB7XazmW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 073F786262; Fri, 16 Jun 2023 13:34:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20621.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::621]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2CBCD8623E for ; Fri, 16 Jun 2023 13:34:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QZybl6apnJ9dKV+r4GMWMUdrsDDiQvE+GTqrLwzFY1f9KtC0s5hfdXttuesDaCSMFu0Vh1NZryJoyMu1kY/bN1nhcK2yMVcQdq5tz8wHT3c4XfMvZvuLOuhtf//HJUWOBO9GMvfL3Fl2bqbhpIuTpKIhwtgq+cPldOr1AienGuS85zEOiWSmGb+nEZ3B1055HaQ6eriRFsZmfLvdeCg23mSoChpUVgvZcXjA/i4nGwbvo7wgUefC84VLheYBiHBTEh7OL82aX0OeGezRs4p9PNVdq/TSPJnAuVEjdqBxJSBdXF5TcZuR8EqAOMAGaVkF6Lca4gwn6Kh7r4qWQpOMXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mg7VAbPZg2kAEujEz5Ag/jwe+AR4fKfXBXuiVlQjQco=; b=L2tAmwzJFfhBJoCY/h2H3sN/uTi6hMF9ggMnaQ1sW9usqw77VZ7285vP29j//kyFuism9/sMIv52RDv4+Expk+4rs5L7Js8RwWmq2RYdg7tbln3VnaGsQHkLCOTKlM897lbYCj3TdnxJH88+7KfatW3jbElUQlukRXXI49GrtxQ5btGRHsE+M+w5nFMNTsg0KVLTgBQzv38nSIotHRm/kRjGI2F4xgz1B64RcvqunM6s6A/iiGQ6TtF/STgFHhKQdiqW3+rcWx7o5X+lTQrN4KRp7d5K+Xs5OziAJCXG1O/zU3jkrIzP48+dibgfiRTpRHYf2YS1dXkmcsHA6gd3gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mg7VAbPZg2kAEujEz5Ag/jwe+AR4fKfXBXuiVlQjQco=; b=SB7XazmWTTHyDh7F1+oTCwmJdAbZ6zH8CSNJYE3hjoVM8IcQ64Eef1t8DLRaSxqCUoc0eQaZ554tykVn496k4I+nJhfQeLBIdG9WnJ/OwdPfa2heFDuA17JxbILLcggd2O7pSGIFmj0SsX6Og81a+tYrfDVT9Pb8l6X8hAlYUWk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB9PR08MB6444.eurprd08.prod.outlook.com (2603:10a6:10:23c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 11:34:39 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7501:6f07:8ffe:f389]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7501:6f07:8ffe:f389%4]) with mapi id 15.20.6500.025; Fri, 16 Jun 2023 11:34:39 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Malte Schmidt , Sughosh Ganu , Malte Schmidt , Stefan Herbrechtsmeier , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 1/5] mkeficapsule: constify function parameters Date: Fri, 16 Jun 2023 13:34:22 +0200 Message-Id: <20230616113426.13976-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230616113426.13976-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20230616113426.13976-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0174.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|DB9PR08MB6444:EE_ X-MS-Office365-Filtering-Correlation-Id: e5fb13ec-3021-4d06-90b6-08db6e5dab46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Njq8jtQcJV/uCc/KfsHU9IpM/2IUae5kcNm7UUxWvtqyqVZKc6TLFq4oWYAcJBwW3dRhCapkINdX02xyousn7kzmOmsb3H35KElH2l/nBlY2hKLsBXV3aODB4n0GruZYlGyYfe1AjIiGIe9wISjjh4J6LXb0feeom8NDLVii2rMsCFSHnX3aEMAIFo46ycLQD+xfo7mo8zoKijszt7jmkEC0s5PbjAyGG6mPdaTawU6Ne4T3m/3cGH2hm2O0IPqWfOWnNHA3mVFVf4w5FLXH18Zlr3wyvUYx7SWqvth2SZYwR9KptsyusbRgxyKSo2wnRQ8I4Ns4UYCG2T59GQ3AMTNqQ4Df/lSjhRhORSHe7T0biJ68OrZC9SF0hFYot9/7Ra5SLr22Q/XK2jiPsL4tnGdBGdVUHP/k5zWYMp7hna7uggAaShSS6LTTWYCu36iO2iSoJdXQSu21AwQwvwpLSZ7nGn5AK0KacF2eAPmINaeNRsIo+YSWuvZzkQKgmarWqTcH7/NgeXNaoI0heo0svtyvo6wO/O20ZxCDQrO0V3RkCOwDGRRwvH1WAIf3rJEqAcd8EUjc9gerwgahy43IynqPC7zhzERqP4rVvNDUf+uWV2vqIDShg9mmnXM0Ywjg X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(346002)(366004)(39860400002)(376002)(396003)(451199021)(5660300002)(54906003)(41300700001)(6486002)(8676002)(8936002)(316002)(6666004)(52116002)(186003)(6506007)(26005)(6512007)(478600001)(4326008)(6916009)(66556008)(66476007)(66946007)(86362001)(1076003)(38100700002)(38350700002)(2616005)(83380400001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nSdGoUXFn0MMI/GAvRQmEWw30Rmx3lPksV9F1bBpx+TFKGPNlZ0pxdcj9yj9FPqRnhBJyCA03qvcqbTGldsXdCZoWGFKsvC5FAgZ7AHHWE9DOzMIgp1nQ8amFm+0RreH1N9l72i8Oa56TwdJo3Evaa6xcSKV2difFkLFNxdRjIL+8l2vr+4V6o2T985G6eA9k2t+iGExbZnkekbZgcjkPPjaoTlrAW/R5EjQGMdKlvMThkyAMai3ckzyfW49Pyh5k81SJemPRazZqlX0qkgd7pnqNDAHhBPdunQ8enaa9xTSrBkAvg9pjFyThc1EBnRFsk/umC7zzoiYaYpX7n1UhvfB8CKR+UEhxCqoV5KqhvTuMZpPkC0cRkQe5e/1My9kKcMNnM1oQCvjXtdD13tU8PCDsmF+ktSKa8/VTpckQ9fM7vigRWmsGFsG3EN45EXY9tW+qsoowkm6m1NE1jKjeXOB9n8TJUaky438dlifZfb5rwDCaOCPprmJMFXXgmHMx+NMSzq20AZw/tlTs4YQNQqPxxLvv8otQjdCioMxiMU1MKeSzBLlnliJ0ZWkMcEqx6s7CIwUYh0IrZWYE4sIGHbU3iuxZEoYdjhSDdKA6bTOL5JHKl+Xbhw0GUT0UxaZvCe3ldWoKa6O9LURMozWdHmYUT2CZgUJQvquSEavgRgpTr8H70AsuD0soom+jv4a/RyUtGX5F0PRWK3jdZmRV93UJbVO3f/JPKLNcOuzWSkm4kyhBO++103bi651uwK/XiXVuCDie4V/OQANyMHvEyEv7h8JVq/F7RhaeNdSKK5Cxvm6PyGzT5K7Ta/I8cgYHrgwVdt8xlRNf8eBwZRmbZxG0Yawqhm5pttt5ueEx9tXtxhSe9W4GTfN7Z2pIjv3UbLBRW4Yl7GDaqfdWwocMi3NA1QjTJZT3B/u2x1R/UsH3Mctu+Yobtk3m8O891O2wt97YnvNBtb+O05JfoRi70XiM566QCNQCsqR0I6ggSSB91ZrqzD7l5dILiOcL0hPMRrX6QrqbOJtkzpOZMOXs+Wvd6Kzx4Jo0qgr22cjDkL+yRdcBa1/1lZd/iHSJjVeFtIUV4mcvpnmT06MOM/2RDTWDD65w7dKiOVFI77YVxZo9ICFbb7zTFvKETnyUe1yNf96ksbNeKOKNgLbtn/D3mGcd3u/sdIFP2IYAhHhyZ8NziG4+JMIi8vXhIY+Xe374cHC2FddDhDlk755NOhBWUx4XJDJ0vDne5A0tZS4vr0nfYNouyYRBNticZT4WvSCjeEdxv5smitomqs0AXet3qUvln1i0InDyAy/kDwaDfNfF59Dlbm4MXSGCO5FRPVKGEE6Hj5D9sKhLvI3kuMAzTDd1BR9Db3PLxSXInGAiECtFTeCKYICfGhUdFcg1iE4ZlKbP1g6cQZXTZbBdTHtOUDCMaVxQ1+sU2IQDRvmVkB+yfBePasOSGRk9d72u7Gvx26zKiWch1NXMBnLiTK6I+vs+OAa3GLnNE9qTg7iRk6I6IMKfuD39hmgQmCBvS3QLN9JXva+hqN2Y6CClW90WJic/A5oz6UtL9tOhTeIwd2pNfJFKA3bDARiGdldWK7xxym77ieJKxiuAX1L5h4x5A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5fb13ec-3021-4d06-90b6-08db6e5dab46 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 11:34:38.8750 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dvWOqPV+PdSV1iYmLMwu0HZnWRpINKfQR9bRbxYVWLKJIjsG1djpHbLUjhTZwt0qn+yPqL8lrPqnAz5Df0irPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6444 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Malte Schmidt Use const keyword for function parameters where appropriate. Signed-off-by: Malte Schmidt Signed-off-by: Stefan Herbrechtsmeier --- tools/mkeficapsule.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c index 52be1f122e..b8db00b16b 100644 --- a/tools/mkeficapsule.c +++ b/tools/mkeficapsule.c @@ -88,8 +88,8 @@ static void print_usage(void) * are filled in by create_auth_data(). */ struct auth_context { - char *key_file; - char *cert_file; + const char *key_file; + const char *cert_file; uint8_t *image_data; size_t image_size; struct efi_firmware_image_authentication auth; @@ -112,7 +112,7 @@ static int dump_sig; * * 0 - on success * * -1 - on failure */ -static int read_bin_file(char *bin, uint8_t **data, off_t *bin_size) +static int read_bin_file(const char *bin, uint8_t **data, off_t *bin_size) { FILE *g; struct stat bin_stat; @@ -170,7 +170,8 @@ err: * * 0 - on success * * -1 - on failure */ -static int write_capsule_file(FILE *f, void *data, size_t size, const char *msg) +static int write_capsule_file(FILE *f, const void *data, size_t size, + const char *msg) { size_t size_written; @@ -343,7 +344,8 @@ static int create_auth_data(struct auth_context *ctx) * * 0 - on success * * -1 - on failure */ -static int dump_signature(const char *path, uint8_t *signature, size_t sig_size) +static int dump_signature(const char *path, const uint8_t *signature, + size_t sig_size) { char *sig_path; FILE *f; @@ -402,10 +404,12 @@ static void free_sig_data(struct auth_context *ctx) * * 0 - on success * * -1 - on failure */ -static int create_fwbin(char *path, char *bin, efi_guid_t *guid, - unsigned long index, unsigned long instance, - struct fmp_payload_header_params *fmp_ph_params, - uint64_t mcount, char *privkey_file, char *cert_file, +static int create_fwbin(const char *path, const char *bin, + const efi_guid_t *guid, unsigned long index, + unsigned long instance, + const struct fmp_payload_header_params *fmp_ph_params, + uint64_t mcount, + const char *privkey_file, const char *cert_file, uint16_t oemflags) { struct efi_capsule_header header; @@ -604,7 +608,8 @@ void convert_uuid_to_guid(unsigned char *buf) buf[7] = c; } -static int create_empty_capsule(char *path, efi_guid_t *guid, bool fw_accept) +static int create_empty_capsule(const char *path, const efi_guid_t *guid, + bool fw_accept) { struct efi_capsule_header header = { 0 }; FILE *f = NULL; @@ -666,7 +671,7 @@ int main(int argc, char **argv) unsigned long index, instance; uint64_t mcount; unsigned long oemflags; - char *privkey_file, *cert_file; + const char *privkey_file, *cert_file; int c, idx; struct fmp_payload_header_params fmp_ph_params = { 0 };