From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.8252.1618911140789455611 for ; Tue, 20 Apr 2021 02:32:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=r+RZkk5o; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 1ZaagmQDhV4YszQeNiGOQrv/ifAuGvuBigw47hSPhD2WMwEkwNcoSo48nZqr/VN6FiIMHl94YU lCnTjqSp8xPg== X-IronPort-AV: E=McAfee;i="6200,9189,9959"; a="182968961" X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="182968961" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 02:32:19 -0700 IronPort-SDR: 2AOMCV8QNibV4ecfaFyFsaGY9lwAy8/C6/68e9DI5Nc5mxMWpe9NMKHVin+JAv2CSw++XMw9WK unK4721XVb2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="390939716" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga007.fm.intel.com with ESMTP; 20 Apr 2021 02:32:12 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 20 Apr 2021 02:32:12 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 20 Apr 2021 02:32:11 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Tue, 20 Apr 2021 02:32:11 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Tue, 20 Apr 2021 02:32:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JDvGJjP8m74lykxtM4UehwVSiICGmIMEKBH+Tfb2dq+2kWJnDbvqCu2T9t+IkS/WKUSIK6M/gTvreyJHFQwmJNd+tluU0hXqDqdLJ/Pb0QsT4PrnHkUhJWnbQSsA/gVlXnPxBE0ETAnbuoGo3Jr4TkheRULac4R20NWxuAolsRDZBYGASrRYeDKe37Z88gZGPE5VKocHk3U8razzOpr/O7P9ReH2Iw0u5xP6FnOpChT+Qg9J2KQv2+xkLr8Rb8oJlp973/+Dv7UaiDp3KBIGD9P0+ZwbpB/ElWePjHLIi6BZIo+uPrciMd7QlK2Kmyty2Dwac27UJ4WWz+fBlWwZHQ== 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-SenderADCheck; bh=0S8bEpqk1VwMFlu3CJAYiIu4kzvKERu3PliKKU/W7zc=; b=LC3xBblC3fOZh7wvnvTsRagseIh3LOltvJnAfuY4xPSfSg3gi3rcyXI8BHc2O8QKLJSrAmPsiot3nXYo71LTCa6ByPbVoFsDDckTNAt50QJxEQ15paZOdHGW30LJE+zBZUDaGlQe+t7N7i12pU5f/OaIUDHukXtsHGqas42/rhu6NkU66kNjeSmvmcdV8YycBt6grvs9TygANPGhdBEOaydoLMXBUuvEplcXXpHg1qHuIrSoCqFW6GXeHtf67FUqvwiNhAOSJ8+AMsxRjqEk49AG0VIdmEpOpb07sObye3bxVM3b7q7o2DDIi91XK3PIVsATqgf/NVggzJ0eiV1V6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0S8bEpqk1VwMFlu3CJAYiIu4kzvKERu3PliKKU/W7zc=; b=r+RZkk5oTJzUsF46y3WcPsCfLR7GSw0SKq7GGqlMzmZZdaE8hVCxNxKEf7tegvvV0XUDvIvII9WjlrGVY5EBE2H27HbuERCDEzl2gzvwYAuiugd4VhkCcxRHqr8vcalaS2nhXsltkPWARL3E86l8+OPRE3c0mAJJyXuSwXtpP04= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3289.namprd11.prod.outlook.com (2603:10b6:5:5f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.21; Tue, 20 Apr 2021 09:32:00 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18%3]) with mapi id 15.20.4042.024; Tue, 20 Apr 2021 09:32:00 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Miazi, Mohammad M" Subject: Re: [edk2-devel] [PATCH] [INTEL][TOOLS][FITGEN] Modify Fitgen tool to support new ACM header Thread-Topic: [edk2-devel] [PATCH] [INTEL][TOOLS][FITGEN] Modify Fitgen tool to support new ACM header Thread-Index: AQHXMevof/ZlMLxFtUOcffSGdvX7kqq9K4mg Date: Tue, 20 Apr 2021 09:31:59 +0000 Message-ID: References: <20210415063129.38520-1-mohammad.m.miazi@intel.com> In-Reply-To: <20210415063129.38520-1-mohammad.m.miazi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.54] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1cbed7e0-a96e-40e9-d772-08d903df262c x-ms-traffictypediagnostic: DM6PR11MB3289: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: g4RsXNy80hdhSQ12eXDzrFR9XknatDRFq2GLraDhXgzm51Nz5JTb8rqPUc4sQTcrOOZXeRBTL1oc1pwxmvXzpbg29+y7oko4hTuWeDQT5KF5EOz3IwpN3F1T/aa22T6JTRb+ixOuM4oYg0+I8B79lJFlm82zz0d3/uSmJjsU2bejhI2FLXJF31XTE2B6h9lom9NwSgz1ywfTClCM2IM5gsNTJiPlI8pLqj3j0KF8DOxIJAH3uzdfQTrNdhJdeqFg/KGdru6aWvc9PLHvO5PUZqfE8p1QimEFpbHJ9svj8lOaOpWoYecZd2KzyFPzt36IwXIAiWaw1tqp2vE8eMlTQgvVLDXaC6DocVOH9mH5xXw6ERbcwTAM2lwG2Xo8kX3p9yzm/4ryU6noN98h0L+F+hAOa3czFMWclms/cmqjHWprwiNEENXd7nzXDT459gty4Zm5FyvtNrTDAqDUMO3uHDnSyt252zx9k5jSRLPDtkZUXRuaF+6iSVLVo6CRUDFdokiAGK2VyXB73bh9dQyNFxd3TrELQP1BPFR1WGWbzu6NQ4Cil4gRXhUc8I3EpetOkSIu4wTW34t0t7sV/UgpJBKDFyK/IoaNTRNCYvWI89yFnhMipGIpwWTPn0FSMRpB2fuGrr7K74mIQjY5Py2ffRgrgmjERMbDwd7b+3iWEQF+g9Hiqq5luKfglWrWDcl8 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(396003)(376002)(366004)(136003)(39860400002)(122000001)(966005)(6636002)(110136005)(64756008)(38100700002)(5660300002)(33656002)(83380400001)(8936002)(76116006)(26005)(478600001)(316002)(53546011)(52536014)(8676002)(2906002)(9686003)(66476007)(186003)(66946007)(66446008)(66556008)(55016002)(6506007)(7696005)(86362001)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?/NUrg7BiJWjqCT2Jh/XJR78XcZsCRFL6JqZZ7kyHYaAqhhfjhLOnLeDk0CTt?= =?us-ascii?Q?laNIFczUQutktX8bs/MEf5uq4pMvpcOy4GeHfmMAsqp3t6lEKa8GVh9oxznB?= =?us-ascii?Q?iGteQ0RR4/PEcqThsIOukAf8SZqPfCw2EYBRYonCpP59q7z5iGn8a7nUt1ug?= =?us-ascii?Q?3zHE42XnEhxZuf+k4UXnsIh437RrTsJlk67dPIp8YJhWnbPVmSst5MjwGbfY?= =?us-ascii?Q?dHuqUJxI/G07qN+vv89UJvTUBcCGMselvYzYEkra6v63X03ZSy3pHWJIrIem?= =?us-ascii?Q?8/3A8SzQ+wXqS+qHZuh+KuX0W8dxYBio4dAdz3TWmgVl3yw0CfEaj/xszLw7?= =?us-ascii?Q?kCJyLdCvZEMf8Mi3H+wDDbvn95Xm/b5CNh3eMdgOKuuUu3AgwvZjr27uqgmY?= =?us-ascii?Q?FILWfck4vafgfo3+n6gfwGycv1j/xpQ98bz/Jy+L4Ajb/ruqjMA4al4yLMdZ?= =?us-ascii?Q?Ej58B3I13KY2/EYtIgT4iX4U+3DdSUsfIK5DSzcQEJ2WBa/yvuE83Bw72BeL?= =?us-ascii?Q?5aA6Frk88MK0NBJCTaMSiLsdG1l92eA2igGYH+/Bc8imVTIZQZbxe9eI0QdQ?= =?us-ascii?Q?JaXGVPoyOPD3ZuvADrIe+HXxP6vQHzivOLgXo+OPpb0KD2Vbsoi/Owo4eKXI?= =?us-ascii?Q?CpqmJDymObNd1DElhDQB5GGRlHxfwferxOdTPcBu/OeFLNKuyNZ4TtfWBnVO?= =?us-ascii?Q?YaoAKybd8sVGoZa5fNYTSIjXdYku5m9/5/fdFoWheXtDcGn1Q8xMcNygSy/0?= =?us-ascii?Q?I0vAabsJKbKthufD6eoNdzifAxsII28lN7B2oZ+5wvDjEHmUs+VyLDdBT5vg?= =?us-ascii?Q?f9SMZ8OshUOXNnNbGVvGsDdeU7Stkl+dqZddBTY1jzVkImFq4yDVxABRmnHF?= =?us-ascii?Q?bdF0eo6oPYp0s1wrlGq3CTWtB5y44fdtAmTxyw1yyf+quIKKT1abHQQS2J5h?= =?us-ascii?Q?IPtOEB8aAVONrOjlIv/2xTsDPgjdMjDN+igw2LZaLEnelBl/yOT4mpe6vsXF?= =?us-ascii?Q?HhhcHirB3vLy0neC7VUw4jlGXwvmY/IBHp9YYkhT6NvThGh8xu0sjVvRG2a6?= =?us-ascii?Q?fr/QCMU2EABLKaS13v23f9YiHIWppTK0yGahYAo33eu5wUpJWAYgZIQDOg8H?= =?us-ascii?Q?kIcy5hDnwOTnbMEv4RDU0x9fTV8RX3TrVcXuQiMua497+tazs0dikiRUX/So?= =?us-ascii?Q?zF+xyWxsJf/KPyEbezCIT2iXrCQEMR0tv/9glws2StNOrABXLsORm533+FxL?= =?us-ascii?Q?jivrFQ+f1TY6xQgb5PZPcDVGgKJ212kiE1zdA4OIaNjNr/b+EQfuWE5KbgNJ?= =?us-ascii?Q?xOioil71/VvprWBdB9Rxsu+G?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cbed7e0-a96e-40e9-d772-08d903df262c X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2021 09:32:00.1759 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: N2N604TXsn3YHnWEC8twWmmhEQZSHFzDIaQdwVOFvcuPVkZ+pC5+oSHPNJsPdJoPMEpstz18FnHlTbIqtn0nog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3289 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Mohammad Mi= azi Sent: Thursday, April 15, 2021 2:31 PM To: devel@edk2.groups.io Cc: Miazi, Mohammad M Subject: [edk2-devel] [PATCH] [INTEL][TOOLS][FITGEN] Modify Fitgen tool to= support new ACM header REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3332 Currently Fitgen tools verifies every detail of ACM header, so any ACM hea= der change breaks the tool. As ACM header is verified by microcode and ACM itself, Fitgen tool does no= t need to verify every fieldof ACM header except some important fields like= ACM_TYPE/SUB_TYPE etc.The changes will remove the dependency between futu= re ACM header changeand FitGen tool. Signed-off-by: Mohammad Miazi --- Silicon/Intel/Tools/FitGen/FitGen.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/Fit= Gen/FitGen.c index 36e6e3c905..290e688f6e 100644 --- a/Silicon/Intel/Tools/FitGen/FitGen.c +++ b/Silicon/Intel/Tools/FitGen/FitGen.c @@ -2,7 +2,7 @@ This utility is part of build process for IA32/X64 FD. It generates FIT table. =20 -Copyright (c) 2010-2020, Intel Corporation. All rights reserved.
+Copyright (c) 2010-2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -48,6 +48,7 @@ typedef struct { #define ACM_PKCS_1_5_RSA_SIGNATURE_SHA384_SIZE 384 =20 #define ACM_HEADER_VERSION_3 (3 << 16) +#define ACM_HEADER_VERSION_0 (0) #define ACM_MODULE_TYPE_CHIPSET_ACM 2 #define ACM_MODULE_SUBTYPE_CAPABLE_OF_EXECUTE_AT_RESET 0x1 #define ACM_MODULE_SUBTYPE_ANC_MODULE 0x2 @@ -2456,7 +2457,16 @@ Returns: DumpHex (Buffer, Acm->KeySize * 4); printf ("\n"); Buffer +=3D Acm->KeySize * 4; - + // + // To simplify the tool and making it independent of ACM header=20 + change, // the rest of ACM parsing will be skipped starting=20 + ACM_HEADER_VERSION4 // if((Acm->HeaderVersion !=3D=20 + ACM_HEADER_VERSION_3) && (Acm->HeaderVersion !=3D ACM_HEADER_VERSION_0))= { + printf ( + "****************************************************************= *************\n\n" + ); + return; + } if (Acm->HeaderVersion =3D=3D ACM_HEADER_VERSION_3) { printf (" RSASig - \n"); DumpHex (Buffer, ACM_PKCS_1_5_RSA_SIGNATURE_SHA384_SIZE); // PKCS #1.= 5 RSA Signature @@ -2580,6 +2590,14 @@ Returns: return FALSE; } =20 + // + // To simplify the tool and making it independent of ACM header=20 + change, // the following check will be skipped starting=20 + ACM_HEADER_VERSION3 // if((Acm->HeaderVersion !=3D=20 + ACM_HEADER_VERSION_3) && (Acm->HeaderVersion !=3D ACM_HEADER_VERSION_0))= { + printf ("ACM header Version 4 or higher, bypassing other checks!\n"); + return TRUE; + } Buffer =3D (UINT8 *)(Acm + 1); Buffer +=3D Acm->KeySize * 4; if (Acm->HeaderVersion =3D=3D ACM_HEADER_VERSION_3) { -- 2.16.2.windows.1