From patchwork Mon Dec 12 19:12:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715126 X-Patchwork-Delegate: trini@ti.com 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 (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=SBrNpY0K; 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 4NWB9y29FJz23np for ; Tue, 13 Dec 2022 06:13:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F0F48544A; Mon, 12 Dec 2022 20:13:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.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=seco.com header.i=@seco.com header.b="SBrNpY0K"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3A1A85306; Mon, 12 Dec 2022 20:13:21 +0100 (CET) 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,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2077.outbound.protection.outlook.com [40.107.20.77]) (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 21C1E8544A for ; Mon, 12 Dec 2022 20:13:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oFc3381/3as4kuQyfVMv2KAf8C4VwLg1SV3qAjxq4G1ycQw7rkPlOy3Oyb+9vPxxVwcg0hPjfd04ot+KAOFuxy/55en+5n7TRAlA2oEf8RFOwmubo7hUjHkl/MrQZ/HIIeu8ly/1MvH4iH+ZY31Nh+MlB3WUrKEbko9p0TDWLcxQFBb+ZaYutomlnngtqnwEpoG/EyBatJWLQ2rrX+nEdbck3pmJSUu6DvwJresGFxLSf2L8baDxgO90FOh0BUAtgQ37JXdPQ/X6SMSeCC5OW8mnfFmDvAbff6yIgPPiY9WSfDlMTmgDU3Lpm3tizsZkVTTQzfTP7IgXyU4r/TGZpw== 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=w8ajvEVyTvhApYt6Zm09HLrW5i77Ql8CeeG3DjJmQPU=; b=DfZr1xz5k54smL3HvexUWsTETS/lzlRVd771FJK8QoRfkFwW50U1dNF4N5xpETIsL6OP7Q1HopQfFoCx7yM5pBH1ZxKRYVL/fYeJGu8EhuPYnOuEDJ+Ijo3OkOWrg6gevaHergz5h8Ma8H8D2eVaJNyNXM17qxG/Yr4+X5cPldgPkWUSu78nyjzjddoKgIt3bojfziSKzIRc0ii5BjZ2p4QLNPDVBWT//9QmVwUNhPfhoy4Egr3nV8U686bW7ba4w1RpZtEoZ3tZKtVOYrqT7F/c8umJ4zHy0YbHGJKEdIOtPBNxXRoaav4KTXokK/wBC127HkavhF0zF5SEt6MIIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w8ajvEVyTvhApYt6Zm09HLrW5i77Ql8CeeG3DjJmQPU=; b=SBrNpY0KwE3sCti6D+OavlBvFO6vIou4y+iEuEUEox/1alADasZ/hoRZ1Adp6+czb53WO+vktJeOVzhSwAG36WRd5bvbusz5D1AcP5E4NMvz5opX7FMUHJQlVnrPQjV3gQFI/HHa8MyhnsqMKL1l2bwF5XX/Oeu2FuS1H5WAXxcUzuf7j1Sm6le7PZZEhVoaDpm7M4BiHj1yRE5P3UoRAUFvcCprYJm5fU9X3SXnk09U6Ai2t+lMAhY/sFHH2tG/DeqCZAH+YifTroAkdALeIGg59Bsj/EpOsQFycto7DOBJcA9wuTyCXoDkB3TpZV5z4Ru1ImEd4sj2CaJq7WDp7Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by AM9PR03MB7980.eurprd03.prod.outlook.com (2603:10a6:20b:43d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Mon, 12 Dec 2022 19:13:18 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb%7]) with mapi id 15.20.5880.019; Mon, 12 Dec 2022 19:13:18 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 1/5] image: Add fallback for fit_config_verify Date: Mon, 12 Dec 2022 14:12:07 -0500 Message-Id: <20221212191211.2105335-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221212191211.2105335-1-sean.anderson@seco.com> References: <20221212191211.2105335-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0046.namprd20.prod.outlook.com (2603:10b6:208:235::15) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|AM9PR03MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f817b0b-c995-405b-68c5-08dadc74ed44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YsXG+XXbYSA89n/NU3apdzgPZrKaQcQZqKrBC9mAtupLsMEgivBgptYZ7UIsACSPBVo9zAJEf+JLDRoJxg8jB+JXHbYLQFOCIZqVbMPGT2FJF1UZpWibDA2qccdUZW6muUP7lHhtL0rz4scpl45lnM76Sk9jR59hUgOG64303AmnlA2pSk/ISeHrd9iKOpgOwVmiYhUBy+KE8mG/Mo1x/7QF1OCWWWabQ4yY8y8uMVKVoI/wLbMWrjcj2sA9lbEchsIeIDdyBNy2fa6NEw6XIR1Tcf4MquSu0S/6tMQyHLHFv7pT+GlfgCecuClwUAirWFM5rzJQFtG4b3s1TLqvKUE1eeHb4PX5kIfeontI5p4JHUkqBvfuWw1Y2JKrbhedFSDPJKN/tU3CAfwoUNdyZAG8qX6Z423Unx/58O7Lvqa1WLV5TCBJwRk6X2V7Jiuz8IfSpcOXYXkXlSvRYbV1zLGaMBhoYcwvWfZ8EesB75aoujVVS/7035mn/K24kIQB2UircdiqZrsLkW5PvxHOglw9Audrz5Buxk/E0CLUydB89CE3xC3+P42x+sGL7j0xUoNks1fXcX+R3P/q/FjS/4ocfRuWHpmoMlCZvrM/BNfJKSTXcnLTukcSYSkEc8c1HMStbAfwb8jVXI2umOFf7NQ02I3ITrmnHMT86dCx+0//cEYpvxYcRJQhqsWleuK6m0oWTrvKhCZzmG2eonArcw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(136003)(366004)(396003)(376002)(39850400004)(451199015)(66556008)(36756003)(41300700001)(52116002)(66476007)(8676002)(66946007)(4326008)(6916009)(5660300002)(54906003)(316002)(8936002)(86362001)(83380400001)(38350700002)(38100700002)(107886003)(6666004)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 79L150FPi6hlkYtDIZP8fgN0AqgbMtV9BAjCHGfqi2ucebhBj4dLDHN+NUL+7OItMghTkMEpZOAQn3Xk63NxIK0riuuP8nhQaTvTHlyVyA7tAnFk/nXz+VNHqdlvcqFTeodiQKEC1r6Rlk2fUhzRsLrWgDxQF7WW+CCf8Rgrv9LGwlAsmcNL8EKY7dqUpby29nOBjZF0FZsgsDW3bca/0HXKsqgKpVHC0V3/XQIStmi6iEuHKMGzbBL0xPWxfgyn9S34ZAUsYcxVWkfgmtlir7UUjeuqybKJuSuaLJr0oML4TYGGbRturr3hJRPzLj7ADYXco6jxayxNBi+Q8MwTWSLBVNaOPUd5JJwxIgfgVqh70kSPY6EUMjGvr7rhCZvzV+gXTvr+ID+6pNzH0gd+7WBA2HBx+KQMEgDqqZdkHACzw6hkWJWrY+noGINJPzQHHNW+PqMpsuE4LYjDstMTdX3rSqzXfpmcpvDNgX8RyfFuSNrV9JaSujftAeOUgIexKZaLaprQWqDP0ilbtOxyYnWLDQh/8lvzQgO2JtoBhL0oWkodSuDOnBmsLwpMnjyhP2zeRIXyNzw699Cus2MX5kdMSLBBAX7CCxEeDvopWJttYWse6FOn+4kUzlCUTT5d7UmPwGjZTAuhXhbOaEqInuFce1mapjkDP4EHZjyqEzM1htqJdtsCWcY5zR7Y1SxjfgdsjU7ZsclidNsyNCdq/mVxZPcZ8pMmTg/lY38UffA3RSFTURWGSqFJnBenlIv44cHwmoADZLoiaQBZ2sNETN7ht6evlJbKmwRFlP7gR02jft5bj8LNHvo4nNSyTEqH47wxLEW+M+MzCQA+qdyIeD2kh7407fO8Kj5quIlnwY+9X7KD0VImH3QgLBM+uQLPk/wMBCVsM1uSwgF7qV6LjoeHU+Mp60IxfGe474v8pBxAihwG7z0Xm8jDDbAP9tCWKbgqpSDbmPHW/l1dvT8J+TclDp7DuUl7oUPxBlibJxmvoNY8rW3P4d2JqooOo//FQ7QwVVs3dFPLO75xbc6pXtXmUCk+WiaCuoArd4b14RzQY7j9NPRi9qaqwn1pax09jKuKReJ7RYArvzYa+9/J8L0M0HQJw0NgS17ramxGufGYTRSrFJR7t0FeFWkj1rSQO3jRUmvkAdvj+sd1MgAzusdPOru7xgr4GAOFIchCRo4s804U6hMjeJcFPQvO/rQuA1p+N8Wd0yyERPKcHYmBq12t5xrgKIAgFOnp/PLoatfc2TNO3DU7xo+jxI/mdIJh/SeczUUWg7aYhOJj+tyUoJyPngSgNfAvD+0g/DXk5+iVDU5w/y0DtNp1ANZ4zt8fXBN3wnO+zE+f13pr8Q4zbVEvJOXXj8UcZqFRPI4hm2dD77JMcWJE0Ah25SLp3qYt+N+jSNMe3gBDDEv1ajvHrWzUAxabCXEtJjOK8/NNwcpEdpZpOi/3FvXnF0QtkNHXj8QwZIXDnTJViP17vIVaRz9gdhzae3+ZSwqHoOHvF1CC92mf9nRc1Z8c820ucPGz0fZwM8olBjwyzHZGOX2Dd601WBEzSPQzQqtOHc6ePtkLbGsD71p9A9RE4KGMmR5M2T5D3o/0gHdD656lViAjQg== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f817b0b-c995-405b-68c5-08dadc74ed44 X-MS-Exchange-CrossTenant-AuthSource: DB9PR03MB8847.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 19:13:18.3533 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tYAPk0QngOing6d3C1KNqDF5UlF/4UFp3U1mq7bleD+wtB5ylV4Q1qa5kF7zxmIZ6beVO+gdZIZJzb50Meb44g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB7980 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.6 at phobos.denx.de X-Virus-Status: Clean Add a fallback for this function so it can be used without regard to whether FIT_SIGNATURE is enabled or not. Signed-off-by: Sean Anderson Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- Changes in v4: - New include/image.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/image.h b/include/image.h index 6f21dafba8..2a53c30486 100644 --- a/include/image.h +++ b/include/image.h @@ -1258,7 +1258,14 @@ int fit_image_verify_with_data(const void *fit, int image_noffset, size_t size); int fit_image_verify(const void *fit, int noffset); +#if CONFIG_IS_ENABLED(FIT_SIGNATURE) int fit_config_verify(const void *fit, int conf_noffset); +#else +static inline int fit_config_verify(const void *fit, int conf_noffset) +{ + return 0; +} +#endif int fit_all_image_verify(const void *fit); int fit_config_decrypt(const void *fit, int conf_noffset); int fit_image_check_os(const void *fit, int noffset, uint8_t os);