From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.2547.1685420064864436559 for ; Mon, 29 May 2023 21:14:25 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=U2hZA8oc; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685420064; x=1716956064; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3xl42CLREDTPpJpt3v4F2CJCL7FQ9ghZdmOo2E0UNsI=; b=U2hZA8ocT1Q0db2ZaZPdpxWlJAfwpCParASvzXN/l9lfOaSfH8fozM16 8AtX2c87E/s/nlxYI2KyadDhpUEc20REi9d6jpJYRQrROp+P0V/EIyREt mYtYUwGhPsDJ2XNQTeBN06pXXTXT2PULmkdPDacgg/QNa+CtUQvR4/uYV wSvK10PsxAnrl+HMLOGai7Z+IwPCsZh+ZD3ZcBKmYT+QaZd+p36gUeYog LB/a04yEe3v7uil+uYPASQKah9cwqv0dz2AOj7ES+i6c1lq4HlrUcnJoP tYDuUzcYxYohgCS+J/xfpQE6BVVnj8KTM+cwcrgFPLOZcNTwyOsMrNXcY w==; X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="344311913" X-IronPort-AV: E=Sophos;i="6.00,203,1681196400"; d="scan'208";a="344311913" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2023 21:14:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="709489960" X-IronPort-AV: E=Sophos;i="6.00,203,1681196400"; d="scan'208";a="709489960" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga007.fm.intel.com with ESMTP; 29 May 2023 21:14:23 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 29 May 2023 21:14:23 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 29 May 2023 21:14:22 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Mon, 29 May 2023 21:14:22 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 29 May 2023 21:14:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AeGHLr2nzk5fN37tpSm/jkBG5fus/UKoiQt65v45bX3u89W7F06WyZ4D3HaR63Cqo3fNLiVKxPsw9d2mBxa8EOfB2a3Z7DBFDajTMW9BXl3xKzpaaDpDXJnbD3K0stqC7NGVbwR/RL6HEuo2iBn9raHlK903xbmfpJ3vrZ8MwRRXZV+ErDbCChiIIHfP166bA0q4lYXDF8YhnxRoExnG+9NuXAEZwb4hRXLeP1kLjk9xcRDFGN26xZMyf7DD/k4VxPZ+wcH6XuDSZFBCC3d7lFhKHP/8irLNYpWwjij6eU72ZODe4DqEaZ3FSQCxv0q09kHwUPrnE3vyhcM5uRf9iw== 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=rr/WvjNj8VKFIZfItgIBBAET4j/2pb+uUCBOL8t2oPY=; b=LdUap/nJRXfcfYvG/5LZ+I41sBwzGqKTK1ZJPBXsv/p5l8hAuMPqBcjS0Vkr1yKyeg47xBTDNTHBzJyZDgP3tlX4xWRw+NV2RHZWHoymoRVXRhm8iRAVbMIUbkT+72K55ojH+v99CaDpAAvwrOuZTOImzlpB//ActYRl7DEoF7Yx+fh5zYhIe8JTuylb7As320u3eKSfmUA2LoTBznDVsXIziZdJtE9ncRyzmCCBYgEFZkFf5Vqbg6kjQXAoVRiQcBxRWnUxywXMEP0OX9YVADlSL+6Ja7Y7e0tVU9ouPlBYXg/ki33mWtqdxDoCgK09nFr26P3UXcnsAgIWzSjXbQ== 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 Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by SN7PR11MB6971.namprd11.prod.outlook.com (2603:10b6:806:2ab::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23; Tue, 30 May 2023 04:14:18 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::4dfe:46ec:2197:1783]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::4dfe:46ec:2197:1783%6]) with mapi id 15.20.6433.017; Tue, 30 May 2023 04:14:18 +0000 From: "Yao, Jiewen" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Gao, Liming" , "Liu, Zhiguang" , Oliver Smith-Denny , Pedro Falcato , "Pop, Aaron" Subject: Re: [edk2-devel] [Patch 1/2] MdePkg/Include/IndustryStandard: Address C++ keyword collisions Thread-Topic: [edk2-devel] [Patch 1/2] MdePkg/Include/IndustryStandard: Address C++ keyword collisions Thread-Index: AQHZklAVfDe3SP14wkyqe2z+3OFv8a9yNbmg Date: Tue, 30 May 2023 04:14:18 +0000 Message-ID: References: <20230529170649.1506-1-michael.d.kinney@intel.com> <20230529170649.1506-2-michael.d.kinney@intel.com> In-Reply-To: <20230529170649.1506-2-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|SN7PR11MB6971:EE_ x-ms-office365-filtering-correlation-id: a7fd3939-58fd-4c3b-66f7-08db60c45695 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: fykCj9LsvYf8OiNPPIpVAHe9yklIlxthcSQ961ByrJWYDTk0NfoG7zfRNqkVQgLRx28ZyNOqQ1CLbRx8xzORexoQuIMcS0yvFJM75IhnrKEoA4yHakdt8nCIEMs03AIOXSbEuCjIqlRcDLRjSpagDuTlEXrRie8pbwS/jx/2dcF+1AycOJOGJkDikyj9XE76QTkKgk3SlplBE8L4WrQ94U7UCNHE+PcKUTkYJWw5qcW40ZdrFUJ1VozpNY2qh+iIf+nBKEh9w7UcMRptFa3S2MMa/p3XNBHwMK/dNjp5emz0HUVMnZGUba6CCzqzCHgTa3rcZKAxxBkPrkq2I+MPkcVoTRw00uHtU14yyAPXgkwJO/mWoHlWiKVoQhCg+AOMJ6zGG7ijsWtVy7bO6Ap0k1dbN5ZdLzR8HNtQthLvXlQNyYniXApUuPuDY9SRMFFu+laBLsOrBLR+JH1VoDNLD3qIv+8wnd/i8qVyPt5Ak3e3YvdDuFkz05bQk+eBTWEgiEoGROdgnGMiWew68vx0Xk4LRsHELUknb+FHMYzLDUxHaMN0zDzkLhoUtTVslutbEbFPOaqUZ1CepFONRk3TwQl9+PK5A9sE+U5DyaudoBhwLtVyJWfKkTLiH0U4J5aJ6YEFXiQqYS5AFvkn0ROQhw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5872.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(346002)(136003)(396003)(366004)(39860400002)(451199021)(66899021)(478600001)(966005)(66446008)(64756008)(76116006)(66946007)(66556008)(66476007)(19627235002)(110136005)(54906003)(6636002)(4326008)(316002)(86362001)(33656002)(83380400001)(53546011)(9686003)(6506007)(26005)(186003)(5660300002)(41300700001)(8936002)(8676002)(52536014)(2906002)(7696005)(71200400001)(55016003)(38100700002)(38070700005)(82960400001)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?GFQW5I+0wIZowIXL00EQdyvca49naKINfOLezIQwNSznR3ScLILdCDkcH+NH?= =?us-ascii?Q?gQgdtTt70yXNxu5m0vOsZfwzVHsULeyeJV8WE7WPYNjwDBtPkRb81z3rEND7?= =?us-ascii?Q?gD8591dSA48BVUDRD4JhIvtDFFvF15kScBYwkB0MHAC2EjBJUyZ155pvetw3?= =?us-ascii?Q?05Gq+IVXMI8x5z3weKUx24JmuRXDN6cgu9fVnrq3eYFl1XHUKoemaZZPpRCR?= =?us-ascii?Q?7uovFvh6wkf1/CGT/DJqhKbP1SzUHrK5h/TCJ8BHqPBoLns+rKWnH9+WDqHo?= =?us-ascii?Q?22x+ml/4XxOKiSpXH6L4Jm2LEjdqDv/ARr0SELnKxY7+5e3m3DcuCxFQjcV4?= =?us-ascii?Q?O67n4p5gunAQCjGqzsiDKrzA5S7+xh9SoI6bTwHGd49OVPTsuQ+Je95lfQ5C?= =?us-ascii?Q?ucDj5S3TCtms5JtGCVYm/AyJ2naNcf8J9o0yERTNd0TQ0/1LVLdpOIwmEzRU?= =?us-ascii?Q?d0vrtTC0LujYv2ZfZjfSfM0LQYLCq5nz/WnlSb2wx0EyX5Tnt1OvT7fSS6KP?= =?us-ascii?Q?kQl4VFTyEHwCu+6OeLpSPGwpAzb4rDIxk4Ux81tweTQI6Qvg1NIK6yJb7d4C?= =?us-ascii?Q?oZ5yIAMtMl+fHJirguJHu32XQ0oReFcvmHZ0Y0gK8ymZejx+FaOwao0MuXU+?= =?us-ascii?Q?oDIJgV1lD/3k6MX9oQWgV6rtz/ZmA/A7EmYRukl1QDDt3ZUCptr/tqItqCK9?= =?us-ascii?Q?WCwj9zwuZ92R/f+4t0grvn/auu8d3qxxl1nEXH0bAcOzwayRVqHSzczdfq8c?= =?us-ascii?Q?AvFN3RyZdyYk4Z6g8d8ITk7ImoT5tNUOECdQfJhqvhSs+ypGU1AlM1D+SZqv?= =?us-ascii?Q?95i/CN8PQ4acsHcxFbcfkAjHJ8+UMrFCTylNoMX4Lqusz1WkRM21HELWF7ra?= =?us-ascii?Q?onAG6eU1ek/naVig2lotedq4eZBDIqAP5ytRvy/W7VSB/4DwIE+6Wp2xRi+A?= =?us-ascii?Q?hIMwB9/mXqVRPdMGw/uXPqIqimCEoXyIpBFzL/x+6fIkiP8CvhnqZALwu541?= =?us-ascii?Q?nZkARUpJ1Irk3G4uhot14+CpGH+/FTP1PRx9EaUmADOMpGU44pXf3BPopdyk?= =?us-ascii?Q?fEXsxyRuVOKb9I1eZhIGerAQDJcYn89z11rBam5sAVl105cC+KhbySVzNRaf?= =?us-ascii?Q?iHmwt2jRajyWVGXuKZVul8YDlbxjWrFK3KhUPSA0Nj3eGhIN+gLWIe7qY1DJ?= =?us-ascii?Q?OhLWL43NwWv9wbG4+K1XrJBxilwUwwwyjIW2PLVV/3bSOibiBWq6ZPCIz8i1?= =?us-ascii?Q?3Eb8qPEdLMpkJUzeyC+sUCLR1+O/52Ee7FS9JbSpvOkvk2CpkPHZ3OiGWJJl?= =?us-ascii?Q?hetXHyaeor8NPcLKBCV3NQZvodeA2h7WTd/n3CMgcDF05qwFt6L0yXfgC4Ww?= =?us-ascii?Q?er3S9RN7p+ruZtICEoUIpUx6AgN1mI1DxUnNgonRGxULuCRtOKE2GVVniyHl?= =?us-ascii?Q?w0MapotcVz7RREYYOpdATfjZxxUqvuVknHrxQhOLFEw1LQoFmwETreBOx2TH?= =?us-ascii?Q?VnWzCKUywMLpw3gEdKx7STFKeZg+x43f7q+qcOVdVT6KzAw1d+k6fradEyXe?= =?us-ascii?Q?E5fP6dsMQrMZvqe2C3QjcqJodpLoZZDm+d95ZqGK?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7fd3939-58fd-4c3b-66f7-08db60c45695 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2023 04:14:18.4922 (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: ehSnJpTMqxt16gynENusc1bMC50+mIV/yBBvL5uhaGCcPx47g2tW+y9uHifWnC4VuhPwIqOdoNOXpvj5yQuNiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6971 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen Yao > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Michael D > Kinney > Sent: Tuesday, May 30, 2023 1:07 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Liu, Zhiguang > ; Oliver Smith-Denny ; > Pedro Falcato ; Pop, Aaron > > Subject: [edk2-devel] [Patch 1/2] MdePkg/Include/IndustryStandard: Addres= s > C++ keyword collisions >=20 > Update Tpm12.h and Tpm20.h and not use c++ reserved keywords > operator and xor in C structures to support use of these > include files when building with a C++ compiler. >=20 > * Change operator -> Operator > * Change xor -> Xor >=20 > NOTE: This is a non-backwards compatible change to Tpm12.h > and Tmp20.h. And consumers of these include files that access > the "operator" or "xor" fields must be updated. >=20 > Cc: Liming Gao > Cc: Zhiguang Liu > Cc: Oliver Smith-Denny > Cc: Pedro Falcato > Cc: Aaron Pop > Signed-off-by: Michael D Kinney > --- > MdePkg/Include/IndustryStandard/Tpm12.h | 4 ++-- > MdePkg/Include/IndustryStandard/Tpm20.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h > b/MdePkg/Include/IndustryStandard/Tpm12.h > index 155dcc9f5f99..147c0863fffd 100644 > --- a/MdePkg/Include/IndustryStandard/Tpm12.h > +++ b/MdePkg/Include/IndustryStandard/Tpm12.h > @@ -744,8 +744,8 @@ typedef struct tdTPM_PERMANENT_FLAGS { > BOOLEAN TPMpost; > BOOLEAN TPMpostLock; > BOOLEAN FIPS; > - BOOLEAN operator; > - BOOLEAN enableRevokeEK; > + BOOLEAN Operator; > + BOOLEAN enableRevokeEK; > BOOLEAN nvLocked; > BOOLEAN readSRKPub; > BOOLEAN tpmEstablished; > diff --git a/MdePkg/Include/IndustryStandard/Tpm20.h > b/MdePkg/Include/IndustryStandard/Tpm20.h > index 4440f3769f26..c827af13efd0 100644 > --- a/MdePkg/Include/IndustryStandard/Tpm20.h > +++ b/MdePkg/Include/IndustryStandard/Tpm20.h > @@ -1247,7 +1247,7 @@ typedef union { > TPMI_AES_KEY_BITS aes; > TPMI_SM4_KEY_BITS SM4; > TPM_KEY_BITS sym; > - TPMI_ALG_HASH xor; > + TPMI_ALG_HASH Xor; > } TPMU_SYM_KEY_BITS; >=20 > // Table 123 - TPMU_SYM_MODE Union > @@ -1320,7 +1320,7 @@ typedef struct { > // Table 136 - TPMU_SCHEME_KEYEDHASH Union > typedef union { > TPMS_SCHEME_HMAC hmac; > - TPMS_SCHEME_XOR xor; > + TPMS_SCHEME_XOR Xor; > } TPMU_SCHEME_KEYEDHASH; >=20 > // Table 137 - TPMT_KEYEDHASH_SCHEME Structure > -- > 2.40.1.windows.1 >=20 >=20 >=20 >=20 >=20