From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.9081.1671587510751522811 for ; Tue, 20 Dec 2022 17:51:51 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ll+Tqh7U; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: judah.vang@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671587510; x=1703123510; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5DHE88x3w2jVA9e/Uazc/eGkqTtJCVMYVG5scnKLjvg=; b=ll+Tqh7Ui62fJ/wxjDieW24uTR/TdmK3VS6WtcqWNN2JvRnsi8KE1P2u Zez2jtB3WPsgRzmCdQzf8d2cwaGxF7XON1dJKI31a9IqsAuL3Dbc69qIX Hrx/DAC7gKtv0GVH8awzREh3vrK2yCGZMacvwtfdpoXHeJaRQW4KV7OyC L4JinaVKlQv1HQN8hhHFbIOZRm3ZNODU6fYfOuT7hTyReXUVgbiPdjuZQ gUymZzCa39XGBkEk6LTk9lLqiz7XDrClqnw4NsjLuetZ8RbQKk43SnuRG 5Q1zJPWuTtH/xZDESIMBjwq2c6Qpp/h4KelEJ6d+2XwUG4VNnlPWdQJQg w==; X-IronPort-AV: E=McAfee;i="6500,9779,10567"; a="346885626" X-IronPort-AV: E=Sophos;i="5.96,261,1665471600"; d="scan'208";a="346885626" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2022 17:51:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10567"; a="644671073" X-IronPort-AV: E=Sophos;i="5.96,261,1665471600"; d="scan'208";a="644671073" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga007.jf.intel.com with ESMTP; 20 Dec 2022 17:51:49 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 20 Dec 2022 17:51:49 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 20 Dec 2022 17:51:48 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Tue, 20 Dec 2022 17:51:48 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) 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.2507.16; Tue, 20 Dec 2022 17:51:48 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d619rmNUMvbbq0KFIQhRn0uza+Ex0Zu9wv75Fxq5p91zA51EAEwQy/HgV9YNNqIqkkxYT1rNtpoYy3UCvdxs1iMVnDBKgCtZ9nd+8EO+msTgV4SR6WauXmL7GI+qdAKtwQfy03ycq81cS4S37gTpXTtWFM37kqmz40oaSUm6Z5GThNEaQxMI2YA9cnjzznUGr/SW6NVVx86XTI8DzFaDV9aLGbwHVqqiXKK6lcsEi2cZQoIENTsgNh8pX8XcsX5eRFEMsaq+yxc4Hg+Bt5W7yvfi3+q1xNvDosCiZ0DQcF4Ih2Dk5flKV5tTW7DFRWATara2wz0Flxx3Ie/1wyqI6w== 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=lwnO5frrosKmBHdzjWA9H0CAV+LmWlvxmM6bjJvnvW0=; b=E8RZhcr15rZ3Em19qIq0y3vAFPg1rHEJrgAgeQf2/7dENPIbZW0IzZXC8543yz6E9Hw0EyYFXqFfApDrft9EzEEP5bk1+iBMSUYZldNgOgRlB7t0EUJMuo6AJrtULd3szYyIrngojQFVq1KElvVCkuMIk7iuehn2dFllh+PGDakZQwTSoLjAwt8JithAP0bPzP8ooEQA2ZZaBNTazuBPV4AbaZuqgFrQLHNUsiZGOTEFewMCt81Th2v5S20WEB5diqp6BoOChXF+9sQZBbaoqAEcxnfD7BBa3MhcxH3tqDwH9498Yb4ViUhJXbC9Fs9VtkXIyUymPuxhDyBFrPCakg== 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 BL3PR11MB6434.namprd11.prod.outlook.com (2603:10b6:208:3ba::22) by DM6PR11MB4676.namprd11.prod.outlook.com (2603:10b6:5:2a7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 01:51:46 +0000 Received: from BL3PR11MB6434.namprd11.prod.outlook.com ([fe80::c4e1:6f9b:9f0:aa64]) by BL3PR11MB6434.namprd11.prod.outlook.com ([fe80::c4e1:6f9b:9f0:aa64%8]) with mapi id 15.20.5924.016; Wed, 21 Dec 2022 01:51:45 +0000 From: "Judah Vang" To: "Yao, Jiewen" , "Wang, Jian J" , "devel@edk2.groups.io" CC: "Kinney, Michael D" , "Mistry, Nishant C" Subject: Re: [PATCH] SecurityPkg: deprecate RpmcLib and VariableKeyLib Thread-Topic: [PATCH] SecurityPkg: deprecate RpmcLib and VariableKeyLib Thread-Index: AQHZEDGuVnzrtdSRy02ennHP32zkJK5uRTWAgAlX2hA= Date: Wed, 21 Dec 2022 01:51:45 +0000 Message-ID: References: <20221215030223.899-1-jian.j.wang@intel.com> In-Reply-To: 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: BL3PR11MB6434:EE_|DM6PR11MB4676:EE_ x-ms-office365-filtering-correlation-id: 5bdebcf1-ba1c-4326-e37d-08dae2f5eab0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: eGzHZXgRFjWCMlYv/V+gqihLxLS+oWToatoE/AAHi2GDKGMjaPsTn+6KuFzBehsLVCrtr+MH4ZQBLbGJ0/Nk7Apr5imuIOG3+3mPHU+Rj1ZRcMAo0iAuKvbSrFmKO7YWnPdLZaGP78TMBC3CSHFWhT3uur5g9QUh+yLOSuVm3lp/YTmDULgcwychyVD2IJ+tDvo/41/ApoxS2G1vfuZuir0LkpXfccOIPf/zFdxTJb6pIvK8MsEVrs6JA02K/JsjzBQOlh6TO6hT6qr8vKvD/r1Q7iVg28Uto9joUVGECw2UPOUb9JT1QnVzw4st9WsH4QrjNKS8cxWqurb1zfJrLVjE14BRpwThw452rsaQSOEDcdiCEZZodGLTJ+nL5zHs39pADv5c+HIzyk9nUnjRXrJZ3t/oK7ox5M4vFCDgYiPnruWubIdhO4t6mybvHy0GCr57WkgScXTbdYXK8HQfAfPG/NdhylCbWmcXSqG9UC7qkyZ//5zhNadxNrPMr53SiJYP8rfwbgLJgUV3cLFinVqDpJ26Y9vuwW4u5zokHd8+Brn+FEpNnvlcHLNEDz36wkKhxbIAOR1dMcpBHp9kUU57faLNT7BGQ4tLTeZVBps6N4ItRe7SQTevtbgzSKbhjJqYi1O5YaF7SzVCkPFcacc6r+9yleX8WBgAN3AzxA2szvX/BnctmZjrKHAm3M59yMmdsJbTiXJ63d+a3KmnIb5RkK0oJROuTYbEHoUPS8c= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL3PR11MB6434.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(376002)(366004)(136003)(346002)(39860400002)(451199015)(83380400001)(86362001)(55016003)(33656002)(122000001)(38070700005)(38100700002)(82960400001)(316002)(8936002)(66446008)(2906002)(54906003)(66946007)(110136005)(64756008)(66556008)(76116006)(66476007)(5660300002)(4326008)(30864003)(8676002)(53546011)(186003)(9686003)(7696005)(41300700001)(6506007)(26005)(15650500001)(52536014)(107886003)(478600001)(71200400001)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ZVykNrrsdMpeHSIIXi+/Cc/oo5jItmmpvtj4eLON1XeYEfPa1dhomEQOBpzf?= =?us-ascii?Q?hfdotpeRwdPugc2z/rCtv/IjS3OyZT3fPzrOZTiB3Otess/rfymvMDwVEeND?= =?us-ascii?Q?S+Wcv17I3INqjlL4tGSjgu6V8vmqLQtZYrIMbxJBBNIFlVZqe3l98Ny7ylhH?= =?us-ascii?Q?MOcVA2duGmAMz3EnJFi+7Dx2thkMVk6kDdGYlXDczq3pqlX+UFM/V70l0jZ7?= =?us-ascii?Q?Hjcn4rg6s95XQRT8ib6mXyhsKAqD/REwooHtxlSDfM2DNvPhsGz70HrE+eDA?= =?us-ascii?Q?7IXAaRv26oPJYEIynX3rnaxigfUksxN8tRM35BRR7CZLdDABfkYjnK0b2Occ?= =?us-ascii?Q?JTAh4L9IFApwDe+jvW4zIrt9+tgqu895Q3YLlxSX/PIkA/rqkA7WEtnKKuKO?= =?us-ascii?Q?EMjgbNn0VZKi7j12kmJBRlZgwB38uyG3+fJdvXcm0A/nuKAsHoGtpbYgPDmT?= =?us-ascii?Q?wuJp+iRVk0WZuyF5nzGuegkPA0AyxHW7npnFMrDjHVFPWQvNB1tjLdZtvQR1?= =?us-ascii?Q?yPVZXk1TU2kcJdI2p2hNfXVSTQQNHk44PpNaU5zJRbncl4CKqiiGugeRtxqn?= =?us-ascii?Q?rP4lj20fb3fBo2K/Zzl+ce7iO9wqaMtZrrzibzw01FutXzyIHvBwaIclifHS?= =?us-ascii?Q?zAKhAUQ/iRJhkw79xLBJfdq+6ZSTovBxgTUsK496TdTCsEFpx8aYzZii9RUR?= =?us-ascii?Q?Z75dSz12vEwcY50lZlkOAntYoyqs5hPSgyXata/sK7Q0RxizH40OnqrMBohq?= =?us-ascii?Q?GtF8cnb/xFf/MbUf7xwxr8h2ZC7SrJcPlHV9BZx3WTerJAZI/xYvTp/iD84p?= =?us-ascii?Q?oO9+LLpQRtay/CWHCcE51S2fLZWUKV3fz9XQWEoJUVOOGoSL0WpSZExNjzr5?= =?us-ascii?Q?FO3KR6wDvaQlLnMWDEOYuePjH/ld2y042ZslfeOdPUVNGkZCBoPiaCA6D9I4?= =?us-ascii?Q?n7xCAymAatyzZt5tkwT22s9iIvdPKnJ3eQF+zKPoHDWOFhw3cn13ojSz4QwC?= =?us-ascii?Q?bDgQhI9o6IsVRlgWikfMHXlIRa0kCw8cWfe+g3mbquJhPKlqZUFrpO3KeDz1?= =?us-ascii?Q?XcISKZufCkEvG7Sk+iH/caW83n9/erVoeEwpNkyWzDQPaUuajR/Hft74UN+x?= =?us-ascii?Q?WZ54R6wUNIRg7RbOUB/7KJJ95exMXBmLHY+Yg47Ej1wdYU28GfeWSvu3eOLy?= =?us-ascii?Q?zkSVB1hgrGcwe8E2KbPcO6opTaPuIJ5e/6CsQXA7zxg+KL55fOcA9Fg5kvAA?= =?us-ascii?Q?rYBA57EE9rT2zvFgU48tUxSxqMtur7ZCbwwuKv0fvjBa4Lq3t9inv7hSXajr?= =?us-ascii?Q?cfXm4uKc0E/OmBMJ1yLE7ev+lQWIKjQugRf5vJygcHcSyfEid3llUMG2kBHg?= =?us-ascii?Q?zeoHksb/oeKeuVLy2i5IiOmg+/gqjiqxiOqCMkGXowwa+XRCfsArZ5BGsqwx?= =?us-ascii?Q?FnC4CoqO1TlNl+B+qEp3C8OIThaW4M7UZBTTyJ6T5umMOLZsUT/TsCZhCE7w?= =?us-ascii?Q?4w639rL6TxARNjlcF96Y0h0B0/cSAL2/6tzrQYXKQs4TpjKyDFisx3NMFoVn?= =?us-ascii?Q?VObBuzjn1+aiMqTD0oVs3HeENRwYMXbqdLJeCfNv?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL3PR11MB6434.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bdebcf1-ba1c-4326-e37d-08dae2f5eab0 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2022 01:51:45.8047 (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: 1etHA1uySs547yyMvVkvSmcHtGFmQPTzY+F5IQrgdQyZDmtxPdYVR4j5Vd95Ik2pWOe3fntRJj46GI3QyiJTgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4676 Return-Path: judah.vang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I reviewed it and it looks good to me. Judah -----Original Message----- From: Yao, Jiewen =20 Sent: Wednesday, December 14, 2022 7:11 PM To: Wang, Jian J ; devel@edk2.groups.io Cc: Kinney, Michael D ; Mistry, Nishant C ; Vang, Judah Subject: RE: [PATCH] SecurityPkg: deprecate RpmcLib and VariableKeyLib Agree. Reviewed-by: Jiewen Yao I will wait for 1 work week to see if there is any objection. If anyone has concern, please let us know as soon as possible. Thank you Yao, Jiewen > -----Original Message----- > From: Wang, Jian J > Sent: Thursday, December 15, 2022 11:02 AM > To: devel@edk2.groups.io > Cc: Yao, Jiewen ; Kinney, Michael D=20 > ; Mistry, Nishant C=20 > ; Vang, Judah > Subject: [PATCH] SecurityPkg: deprecate RpmcLib and VariableKeyLib >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2594 >=20 > There's no real usage of these two libraries. They're deprecated. >=20 > Cc: Jiewen Yao > Cc: Michael D Kinney > Cc: Nishant C Mistry > Cc: Judah Vang > Signed-off-by: Jian J Wang > --- > SecurityPkg/Include/Library/RpmcLib.h | 42 ------------ > SecurityPkg/Include/Library/VariableKeyLib.h | 59 ----------------- =20 > SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c | 46 ------------- > .../Library/RpmcLibNull/RpmcLibNull.inf | 33 ---------- > .../VariableKeyLibNull/VariableKeyLibNull.c | 66 ------------------- > .../VariableKeyLibNull/VariableKeyLibNull.inf | 33 ---------- > SecurityPkg/SecurityPkg.dec | 8 --- > SecurityPkg/SecurityPkg.dsc | 4 -- > 8 files changed, 291 deletions(-) > delete mode 100644 SecurityPkg/Include/Library/RpmcLib.h > delete mode 100644 SecurityPkg/Include/Library/VariableKeyLib.h > delete mode 100644 SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c > delete mode 100644 SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf > delete mode 100644 > SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.c > delete mode 100644 > SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.inf >=20 > diff --git a/SecurityPkg/Include/Library/RpmcLib.h > b/SecurityPkg/Include/Library/RpmcLib.h > deleted file mode 100644 > index df4ba34ba8..0000000000 > --- a/SecurityPkg/Include/Library/RpmcLib.h > +++ /dev/null > @@ -1,42 +0,0 @@ > -/** @file >=20 > - Public definitions for the Replay Protected Monotonic Counter=20 > (RPMC) Library. >=20 > - >=20 > -Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > - >=20 > -**/ >=20 > - >=20 > -#ifndef _RPMC_LIB_H_ >=20 > -#define _RPMC_LIB_H_ >=20 > - >=20 > -#include >=20 > - >=20 > -/** >=20 > - Requests the monotonic counter from the designated RPMC counter. >=20 > - >=20 > - @param[out] CounterValue A pointer to a buffer to store t= he RPMC > value. >=20 > - >=20 > - @retval EFI_SUCCESS The operation completed successf= ully. >=20 > - @retval EFI_DEVICE_ERROR A device error occurred while > attempting to update the counter. >=20 > - @retval EFI_UNSUPPORTED The operation is un-supported. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -RequestMonotonicCounter ( >=20 > - OUT UINT32 *CounterValue >=20 > - ); >=20 > - >=20 > -/** >=20 > - Increments the monotonic counter in the SPI flash device by 1. >=20 > - >=20 > - @retval EFI_SUCCESS The operation completed successf= ully. >=20 > - @retval EFI_DEVICE_ERROR A device error occurred while > attempting to update the counter. >=20 > - @retval EFI_UNSUPPORTED The operation is un-supported. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -IncrementMonotonicCounter ( >=20 > - VOID >=20 > - ); >=20 > - >=20 > -#endif >=20 > diff --git a/SecurityPkg/Include/Library/VariableKeyLib.h > b/SecurityPkg/Include/Library/VariableKeyLib.h > deleted file mode 100644 > index 561ebad09d..0000000000 > --- a/SecurityPkg/Include/Library/VariableKeyLib.h > +++ /dev/null > @@ -1,59 +0,0 @@ > -/** @file >=20 > - Public definitions for Variable Key Library. >=20 > - >=20 > -Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > - >=20 > -**/ >=20 > - >=20 > -#ifndef _VARIABLE_KEY_LIB_H_ >=20 > -#define _VARIABLE_KEY_LIB_H_ >=20 > - >=20 > -#include >=20 > - >=20 > -/** >=20 > - Retrieves the key for integrity and/or confidentiality of variables. >=20 > - >=20 > - @param[out] VariableKey A pointer to pointer for the varia= ble key > buffer. >=20 > - @param[in,out] VariableKeySize The size in bytes of the variable = key. >=20 > - >=20 > - @retval EFI_SUCCESS The variable key was returned. >=20 > - @retval EFI_DEVICE_ERROR An error occurred while attempti= ng to > get the variable key. >=20 > - @retval EFI_ACCESS_DENIED The function was invoked after l= ocking > the key interface. >=20 > - @retval EFI_UNSUPPORTED The variable key is not supporte= d in the > current boot configuration. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -GetVariableKey ( >=20 > - OUT VOID **VariableKey, >=20 > - IN OUT UINTN *VariableKeySize >=20 > - ); >=20 > - >=20 > -/** >=20 > - Regenerates the variable key. >=20 > - >=20 > - @retval EFI_SUCCESS The variable key was regenerated > successfully. >=20 > - @retval EFI_DEVICE_ERROR An error occurred while attempti= ng to > regenerate the key. >=20 > - @retval EFI_ACCESS_DENIED The function was invoked after l= ocking > the key interface. >=20 > - @retval EFI_UNSUPPORTED Key regeneration is not supporte= d in > the current boot configuration. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -RegenerateVariableKey ( >=20 > - VOID >=20 > - ); >=20 > - >=20 > -/** >=20 > - Locks the regenerate key interface. >=20 > - >=20 > - @retval EFI_SUCCESS The key interface was locked suc= cessfully. >=20 > - @retval EFI_UNSUPPORTED Locking the key interface is not > supported in the current boot configuration. >=20 > - @retval Others An error occurred while attempti= ng to lock the > key interface. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -LockVariableKeyInterface ( >=20 > - VOID >=20 > - ); >=20 > - >=20 > -#endif >=20 > diff --git a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c > b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c > deleted file mode 100644 > index 792e48250e..0000000000 > --- a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.c > +++ /dev/null > @@ -1,46 +0,0 @@ > -/** @file >=20 > - NULL RpmcLib instance for build purpose. >=20 > - >=20 > -Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > - >=20 > -**/ >=20 > - >=20 > -#include >=20 > -#include >=20 > - >=20 > -/** >=20 > - Requests the monotonic counter from the designated RPMC counter. >=20 > - >=20 > - @param[out] CounterValue A pointer to a buffer to store t= he RPMC > value. >=20 > - >=20 > - @retval EFI_SUCCESS The operation completed successf= ully. >=20 > - @retval EFI_DEVICE_ERROR A device error occurred while > attempting to update the counter. >=20 > - @retval EFI_UNSUPPORTED The operation is un-supported. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -RequestMonotonicCounter ( >=20 > - OUT UINT32 *CounterValue >=20 > - ) >=20 > -{ >=20 > - ASSERT (FALSE); >=20 > - return EFI_UNSUPPORTED; >=20 > -} >=20 > - >=20 > -/** >=20 > - Increments the monotonic counter in the SPI flash device by 1. >=20 > - >=20 > - @retval EFI_SUCCESS The operation completed successf= ully. >=20 > - @retval EFI_DEVICE_ERROR A device error occurred while > attempting to update the counter. >=20 > - @retval EFI_UNSUPPORTED The operation is un-supported. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -IncrementMonotonicCounter ( >=20 > - VOID >=20 > - ) >=20 > -{ >=20 > - ASSERT (FALSE); >=20 > - return EFI_UNSUPPORTED; >=20 > -} >=20 > diff --git a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf > b/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf > deleted file mode 100644 > index 500edfa87d..0000000000 > --- a/SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf > +++ /dev/null > @@ -1,33 +0,0 @@ > -## @file >=20 > -# Provides Null version of RpmcLib for build purpose. >=20 > -# >=20 > -# Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -# SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > -# >=20 > -## >=20 > - >=20 > -[Defines] >=20 > - INF_VERSION =3D 0x00010029 >=20 > - BASE_NAME =3D RpmcLibNull >=20 > - FILE_GUID =3D FAE0BA22-92E2-4334-8F0F-96AFF9BAE36= 0 >=20 > - MODULE_TYPE =3D BASE >=20 > - VERSION_STRING =3D 1.0 >=20 > - LIBRARY_CLASS =3D RpmcLib >=20 > - >=20 > -# >=20 > -# The following information is for reference only and not required by=20 > the build tools. >=20 > -# >=20 > -# VALID_ARCHITECTURES =3D IA32 X64 Arm AArch64 >=20 > -# >=20 > - >=20 > -[Sources] >=20 > - RpmcLibNull.c >=20 > - >=20 > -[Packages] >=20 > - MdePkg/MdePkg.dec >=20 > - SecurityPkg/SecurityPkg.dec >=20 > - >=20 > -[LibraryClasses] >=20 > - BaseLib >=20 > - DebugLib >=20 > - >=20 > diff --git=20 > a/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.c > b/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.c > deleted file mode 100644 > index a08def767b..0000000000 > --- a/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.c > +++ /dev/null > @@ -1,66 +0,0 @@ > -/** @file >=20 > - Null version of VariableKeyLib for build purpose. Don't use it in=20 > real product. >=20 > - >=20 > -Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > - >=20 > -**/ >=20 > -#include >=20 > -#include >=20 > - >=20 > -/** >=20 > - Retrieves the key for integrity and/or confidentiality of variables. >=20 > - >=20 > - @param[out] VariableKey A pointer to pointer for the varia= ble key > buffer. >=20 > - @param[in,out] VariableKeySize The size in bytes of the variable = key. >=20 > - >=20 > - @retval EFI_SUCCESS The variable key was returned. >=20 > - @retval EFI_DEVICE_ERROR An error occurred while attempti= ng to > get the variable key. >=20 > - @retval EFI_ACCESS_DENIED The function was invoked after l= ocking > the key interface. >=20 > - @retval EFI_UNSUPPORTED The variable key is not supporte= d in the > current boot configuration. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -GetVariableKey ( >=20 > - OUT VOID **VariableKey, >=20 > - IN OUT UINTN *VariableKeySize >=20 > - ) >=20 > -{ >=20 > - ASSERT (FALSE); >=20 > - return EFI_UNSUPPORTED; >=20 > -} >=20 > - >=20 > -/** >=20 > - Regenerates the variable key. >=20 > - >=20 > - @retval EFI_SUCCESS The variable key was regenerated > successfully. >=20 > - @retval EFI_DEVICE_ERROR An error occurred while attempti= ng to > regenerate the key. >=20 > - @retval EFI_ACCESS_DENIED The function was invoked after l= ocking > the key interface. >=20 > - @retval EFI_UNSUPPORTED Key regeneration is not supporte= d in > the current boot configuration. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -RegenerateVariableKey ( >=20 > - VOID >=20 > - ) >=20 > -{ >=20 > - ASSERT (FALSE); >=20 > - return EFI_UNSUPPORTED; >=20 > -} >=20 > - >=20 > -/** >=20 > - Locks the regenerate key interface. >=20 > - >=20 > - @retval EFI_SUCCESS The key interface was locked suc= cessfully. >=20 > - @retval EFI_UNSUPPORTED Locking the key interface is not > supported in the current boot configuration. >=20 > - @retval Others An error occurred while attempti= ng to lock the > key interface. >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -LockVariableKeyInterface ( >=20 > - VOID >=20 > - ) >=20 > -{ >=20 > - ASSERT (FALSE); >=20 > - return EFI_UNSUPPORTED; >=20 > -} >=20 > diff --git=20 > a/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.inf > b/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.inf > deleted file mode 100644 > index ea74e38cf9..0000000000 > --- a/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.inf > +++ /dev/null > @@ -1,33 +0,0 @@ > -## @file >=20 > -# Provides Null version of VariableKeyLib for build only. >=20 > -# >=20 > -# Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > -# SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > -# >=20 > -## >=20 > - >=20 > -[Defines] >=20 > - INF_VERSION =3D 0x00010029 >=20 > - BASE_NAME =3D VariableKeyLibNull >=20 > - FILE_GUID =3D 2B640ED8-1E6A-4516-9F1D-25910E59BC4= A >=20 > - MODULE_TYPE =3D BASE >=20 > - VERSION_STRING =3D 1.0 >=20 > - LIBRARY_CLASS =3D VariableKeyLib >=20 > - >=20 > -# >=20 > -# The following information is for reference only and not required by=20 > the build tools. >=20 > -# >=20 > -# VALID_ARCHITECTURES =3D IA32 X64 Arm AArch64 >=20 > -# >=20 > - >=20 > -[Sources] >=20 > - VariableKeyLibNull.c >=20 > - >=20 > -[Packages] >=20 > - MdePkg/MdePkg.dec >=20 > - SecurityPkg/SecurityPkg.dec >=20 > - >=20 > -[LibraryClasses] >=20 > - BaseLib >=20 > - DebugLib >=20 > - >=20 > diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec=20 > index 7ecf9565d9..358b3dc543 100644 > --- a/SecurityPkg/SecurityPkg.dec > +++ b/SecurityPkg/SecurityPkg.dec > @@ -80,14 +80,6 @@ > # >=20 > TcgStorageOpalLib|Include/Library/TcgStorageOpalLib.h >=20 >=20 >=20 > - ## @libraryclass Provides interfaces to access RPMC device. >=20 > - # >=20 > - RpmcLib|Include/Library/RpmcLib.h >=20 > - >=20 > - ## @libraryclass Provides interfaces to access variable root key. >=20 > - # >=20 > - VariableKeyLib|Include/Library/VariableKeyLib.h >=20 > - >=20 > ## @libraryclass Provides interfaces about firmware TPM measurement. >=20 > # >=20 > TcgEventLogRecordLib|Include/Library/TcgEventLogRecordLib.h >=20 > diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc=20 > index 30d911d8a1..2f679c87a9 100644 > --- a/SecurityPkg/SecurityPkg.dsc > +++ b/SecurityPkg/SecurityPkg.dsc > @@ -68,8 +68,6 @@ >=20 > TcgStorageCoreLib|SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore > TcgStorageCoreLib|Li > b.inf >=20 >=20 > TcgStorageOpalLib|SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpal > TcgStorageOpalLib|Li > b.inf >=20 >=20 > ResetSystemLib|MdeModulePkg/Library/BaseResetSystemLibNull/BaseReset > SystemLibNull.inf >=20 > - > VariableKeyLib|SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNu > VariableKeyLib|ll.in > f >=20 > - RpmcLib|SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf >=20 >=20 > TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEvent > TcgEventLogRecordLib|L > ogRecordLib.inf >=20 >=20 > MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnbloc > kMemoryLibNull.inf >=20 >=20 > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/Secure > SecureBootVariableLib|Bo > otVariableLib.inf >=20 > @@ -264,8 +262,6 @@ > # >=20 > # Variable Confidentiality & Integrity >=20 > # >=20 > - SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.inf >=20 > - SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf >=20 >=20 > SecurityPkg/Library/PlatformPKProtectionLibVarPolicy/PlatformPKProtect > ionL > ibVarPolicy.inf >=20 >=20 >=20 > # >=20 > -- > 2.36.1.windows.1