From patchwork Mon Oct 18 05:49:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannu Lounento X-Patchwork-Id: 1542532 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=vaisala.com header.i=@vaisala.com header.a=rsa-sha256 header.s=selector1 header.b=AL4O3DLq; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HXvpC3zDlz9sRN for ; Mon, 18 Oct 2021 22:31:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4E88A8348B; Mon, 18 Oct 2021 13:31:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=vaisala.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=vaisala.com header.i=@vaisala.com header.b="AL4O3DLq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E8D8833CB; Mon, 18 Oct 2021 07:49:41 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::62a]) (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 3200B833C1 for ; Mon, 18 Oct 2021 07:49:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=vaisala.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hannu.lounento@vaisala.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jXiacOedtIJ7jiQrdgtXRNTttqAtsO/pZ76/PqedFSP3JYn2T0pANikkl5wQRS+L9TMd0mSQ5qg8mIDG7K49Gg0GmfQmwKX3pNexX8lKSN5xYYvtruQ4BlJUgxFc9cv4W6cJ5zSwOSfzxrSeNIPcg3zKWpCsRaoVRPAnpPjFesCsWFrAbsuIKzmXKbQgciYCu6rcKkENaAfcKo9awkhkzxN/oArLW/9Mqt6BJ9vArqNuzfE/yEd8j+yOmsmR7KzL35p7yfLvdXk5VmiwwAt38LFh+OIWMJlnREv+obubGjEG6A5CH5cueVslINf/+AO3HmqCYIfJ99doyJPpDHT3Rw== 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=pPysidGKPWBQ7DbAxgNHlJ5NPneiXFtBYt2wXshnNac=; b=M7K2z6sLSxjIU89dQ7mfRuSyvvKO0vjjwElDn7jk5grhLgwHyddNnb6VxBPWrggW9HfbaOIAfpyU3nW/Rak3OShRsImunrmIBSJP6hNL4vFzUmY5GMPCeXJ6VTjAEyO0HPFG18NgtyDnYMTLX0wGS72byIIbPQ0YrdfgDMIgwVKRqdIbh6A68G/I+Bhk4dwL4vX5LPc8BaBXReB95k7kBByeDJ3cyF3CpCwdAdVRWpXkVYw6BgV92IloOy/MJGgcZDXPW8SuwldI9T78UBeLo6FE2QsDz9jAPqnTXplqAur5GUJOpS36VralGpkByYxCCXB/zW0aYOcXmZM9M37D6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pPysidGKPWBQ7DbAxgNHlJ5NPneiXFtBYt2wXshnNac=; b=AL4O3DLq1H1L4Tn2+KrwI0HUg6bVYdCeE1Bf5wTU5DZcuuRpm6xy2PxQqn/8xxPD3cjd6pXYLAy8X+hfTP6MpgYn5fl4ln2vHWpd3PNEUQ/UtwLS3FaFUJtCfnOckbZCv/l8WwdY9Qo9QjCdMFDwpjV25WJsfOn83j3sZTxsB9bBqY9qHMirtSTG2TliUoTN+e1lqp8lUNbEap7NhmRr1wNSL7av3YrdmfVK5E4cUG5FtJiKzbYeN4D/LqgtqwsZTLIXAyY6R4W7+eEKKeFBM1ZcGrpkTkTiOa/pN3S9dLkZLdu1wqX2GI2KwS3o2ThxAVrcIHPPXhgbQvGka9ljug== Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=vaisala.com; Received: from VI1PR06MB4397.eurprd06.prod.outlook.com (2603:10a6:803:52::28) by VI1PR0602MB3582.eurprd06.prod.outlook.com (2603:10a6:803:10::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 05:49:35 +0000 Received: from VI1PR06MB4397.eurprd06.prod.outlook.com ([fe80::5523:bfc2:ee88:2b5f]) by VI1PR06MB4397.eurprd06.prod.outlook.com ([fe80::5523:bfc2:ee88:2b5f%7]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 05:49:35 +0000 From: Hannu Lounento To: u-boot@lists.denx.de Cc: sjg@chromium.org, Hannu Lounento Subject: [PATCH] image.h: make image_sign_info.fit point to const Date: Mon, 18 Oct 2021 08:49:03 +0300 Message-Id: <20211018054903.946546-1-hannu.lounento@vaisala.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: HE1P189CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::18) To VI1PR06MB4397.eurprd06.prod.outlook.com (2603:10a6:803:52::28) MIME-Version: 1.0 Received: from hel-r90xmr7m.corp.vaisala.com (193.143.230.131) by HE1P189CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Mon, 18 Oct 2021 05:49:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57acfc3e-9db5-4239-56e4-08d991fb10e6 X-MS-TrafficTypeDiagnostic: VI1PR0602MB3582: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7jUjVL48bOZv3phbcqDLIIU8uhbmKj61A9AKczW0B9cVx26+ux41JP9CD3zjPOV4no+/lZfLup2z5SlRC/9JKEOSX5SkfpKsTJTmwNNCwAeAvyQawALxOznl7b3ZXFltJiq+yUnSn6IdkDtvuTb+U20CR5xcS2KevBrM1M/xy9bCTXQHaZS2jiN0CXjs9G90PTvGwAROY+MUj52pFdyszWkon8daC2m5N92iHItRuPXeCNaME9ygZCa/fsNsSo9OeiXITNM7xmJ67Hoe/qXkQhsktnbGWMx+2037uOsNFWkoqQa+JDC8iyIgYuLXXrcJUmtsdZQTCt1RwHtQnVVgvfXNFIgmYT3Y0Z2oDgxQC8vaEiCtG/6owmdJMOWNGgGzKWPjwxvtVC9F7W9T/xgYqlvS8dhWJvEmmpKTKcF/OHU8zYbacUuXtSDCcJ+cHMQxGYJFOzMFtWSbST/37EVaQVhT0m7GUrf86vu1ElKT9y+SpSu1RMvH7qRmUE2JWpp2lqOAQVMgMdOtWWU+zfhMLZ722oNQEg8D1Uw6/Nj9gk5M+IxD/Hvpi2KdxUumeKo7yLoQGxxTTjcI+C/5tQo55fPeqrnwpKPw388ilp5mTKZyWt9XYEGDzvZL+7hFiSWeIjvGlpe11Z7JbMLJh7vBNg38ZA6f8A+pvFEu0Bal77Ts7lQzFFioiv6BTNf24HFpCLFbMFB+qOiw7Nb3uu5e6g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4397.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6486002)(186003)(6916009)(36756003)(956004)(44832011)(6666004)(2616005)(8936002)(316002)(107886003)(86362001)(66476007)(5660300002)(7696005)(2906002)(8676002)(26005)(38100700002)(4326008)(83380400001)(52116002)(38350700002)(1076003)(66946007)(508600001)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CwzBVfz5zW8OkOHnL+gQYpig4X+aVXrXC9s1wDRzpqAbAWSF4SYLGJmkByRnEaXk/ERbDjuiIj2p/Yc3Ty9WXviI3Xp4MmpRIuJZ3JtQGzUK4LaB8ai+QmrKtC+dLWOLX2XBKx9d4cUuTrT90oyw1vCrXq94k2Z7u8kpeQbpfan5AqDFfuBbV4e8x9xOV3sgbiV8JSOuj/VL0qC8QTx6DayY8K7iOD4jbS7JkEVWXLE9bXcfcMWhE3WuQwUUTBOWeEPG19nhnzfjDsn9zepi5f/NPyDpdiXECnTQVg+0OugdsxDU45V/CsTnDGpN2HsBjilvFQJNQKJ3nU8ScpYjHNAxJYcA7JWZSYBKmTurzqo5kkr3vOEseMsIwhDLzTP4XVRkdxfoH8zGGpPy8pLQ/2NT7ivSthb3ve+r2Yz6ArJZRr7bCKl/JVmvhmR31dipRYqcG+AvEloUNN4sEUThra85+LN6UTrh6UUqF4Z745AKOmVjdWSrRvE28LKnM1wEspEiczkNsz5xXEm4ljC9Hvc4MsUj1Kph+D7h2ob0PbUSXZjshrg3i6py3aqAbYGTqd7EYMMAKzPV/uEVAaxEVPzu7GIgYK8HE1asZ6wN/kJHfqL+atxVn5HehFoJhyzyCfwL+r00R8YEiWm+CmATFd64Aegr2SCIoENKMa6V7cO0HSxOUISLMPmrtG4kxucmveF29gVsBAaRrzj8BHfcAbMCwTZEdA47VMaCHqvPbMde8QnSIVFe9kiiLRqneK38UF9pN50mGcwpuQ2+Lhb9xMouIyn22gIU2G686h2vC+gJsn5MYo8CN4zB5rfh2EQdjqyEZUSpFUDTYOR4pxCqsF9fjtGEZQj3RYBgFFLkzTo9fVZn4gM74PPdiLfhBFBgWsSaHIUULrZs26FT5F3awnfSRmWMT+JHXa2XlEHrlxq/uZ1P9JXGevn3w4GxsvFmmQjHNglR39gX/AXbYv/URP8uox8EyQtXkpLmOit78jU7tm50hfbXXBu6ckWI9RLXCTvWjEezBLzlIjA54r1FWc0XaHyOkl4yoLyhQjfNt94p+81ECJvEG+bIAY48o1xp3NfPZl+XLXdbs2rbCN/GIKNpb5eOoa7mxfOz8D+OVYO0wdsD55kitEqLrTyd8u8nzOcW4wFNRPx88icbpMHG4dCwsmGjelNlN9enIUxJSDikhAlI4H3L12C/yBIiFknokyR08c9HP6PWfq4m5xPcsyORY4dPWPplteZ02NwomGaxsj4GOm0hDFldFYiA4lq2+QGb1fdqD6fTe/Fcg0NCA/JKtfel3IV7l/Pr3TNtnRlSt0DBo0wb9LlX2rn2DiYJ X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57acfc3e-9db5-4239-56e4-08d991fb10e6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4397.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 05:49:35.7774 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yH69XNg7vcgQYoDWPdw1HI7tNUI+iBsyiZVs940o91QUXCmmlTUjUjGHaL6Qg/N5Xd1maIvJi+kbewTokIkoy4eCEuGSiX1PcKL6Q7N7ATc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0602MB3582 X-Mailman-Approved-At: Mon, 18 Oct 2021 13:30:59 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean The data blob apparently does not need to be modified through the fit field of the image_sign_info struct so make it point to const to avoid the need to cast away constness in functions that assign a pointer to const data to the field. fit_image_setup_verify already had to cast away constness as it assigned a const void * argument to the field. The cast can now be removed. Signed-off-by: Hannu Lounento Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- common/image-fit-sig.c | 2 +- include/image.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c index 4edebbf2d32..63e5423c925 100644 --- a/common/image-fit-sig.c +++ b/common/image-fit-sig.c @@ -85,7 +85,7 @@ static int fit_image_setup_verify(struct image_sign_info *info, memset(info, '\0', sizeof(*info)); info->keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL); - info->fit = (void *)fit; + info->fit = fit; info->node_offset = noffset; info->name = algo_name; info->checksum = image_get_checksum_algo(algo_name); diff --git a/include/image.h b/include/image.h index 34d13ada84b..fd662e74b41 100644 --- a/include/image.h +++ b/include/image.h @@ -1159,7 +1159,7 @@ struct image_sign_info { const char *keydir; /* Directory conaining keys */ const char *keyname; /* Name of key to use */ const char *keyfile; /* Filename of private or public key */ - void *fit; /* Pointer to FIT blob */ + const void *fit; /* Pointer to FIT blob */ int node_offset; /* Offset of signature node */ const char *name; /* Algorithm name */ struct checksum_algo *checksum; /* Checksum algorithm information */