From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.125087.1671073839727458521 for ; Wed, 14 Dec 2022 19:10:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=KB29rx/J; spf=pass (domain: intel.com, ip: 134.134.136.31, 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=1671073839; x=1702609839; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=pakOg/Yhmb9tXPOiKXRIx5hBWnf7Z5HzWVFIcQiWG+Y=; b=KB29rx/JTEwEgS3BXXssHO2FObFiFO94S08j8rVh6C9XL4ZejS1W5RhJ j6032escPpdq8spgQl/RXL+c2++be2bcwu8bc6CP8g4VtAqDdxdEHUw6g 4Wk9Oo6iQHlJxj0sNd1krtzNrwlaPr/SQ4q3n45DkA9U+GkqyOY94B2bz S1boZ+LVMb3LreqeOfXZKAAf2381HQd3heHGcPWVON+uAnVmM7wwnMQSS vqOJsIUxWVr/iuJyxqSD2EON6UOKd0iC5pWNMUAk7MACIJr1yysLFzDoY +GOQ1et+XowGbdyfjQrKn4q1WqjOCfB5SdNziNOoG5x5hMEt3uSDhGFwe w==; X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="380766948" X-IronPort-AV: E=Sophos;i="5.96,246,1665471600"; d="scan'208";a="380766948" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2022 19:10:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="649236886" X-IronPort-AV: E=Sophos;i="5.96,246,1665471600"; d="scan'208";a="649236886" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga002.jf.intel.com with ESMTP; 14 Dec 2022 19:10:38 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 14 Dec 2022 19:10:37 -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; Wed, 14 Dec 2022 19:10:37 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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; Wed, 14 Dec 2022 19:10:37 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Wed, 14 Dec 2022 19:10:37 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOuN+YA9GecWm/Bhkp1/Q4eYtMukdIM4cMjAATPsI0aTUKBxouzCbaRMkEn+wV1ntQh+g0hbOH6pVJFksjngCxRszMRZGNdq1lPWJWyfNdm0XPd/3ks1L/xJLUXl2NIG3qxq0fIix4uh/4nZL/wZvNIMlDPFyGYSf47Bmn73WUxGK82BgoDVQ6cCCJsdp7fnQpfYiLZlqjl871SVoFvODUwELPsPMFBnvgPVl7GUwE0sxkBHldtmxGjPtJ3juvJezFIbOESQGLETszae1in7+QsiM2eI6CWyW8saQ5oOSJQ/iK07o7UPiz8JQdqG5PrseciOEcai7cb67yA2BqFuGw== 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=RY0RsHc2fJnrVEO8VEoJR+ax4YnUYuE7j2E2lqlPzrE=; b=NdMlUw4Z0BrKplCTO89ulVzfjWCCo2ATVKDHn6anUMulv/CH6iD0DzmGpQyJLfbBJQyN7asJMe10SKRRM9eNgUdMB7AZZi9qu7plYVrqdLyVIDg+D7SPZ1VrHf0WoS5M0kT0RP3vqCTKFIqLfvN2ZJPfJXXCillI6thwWpWsQCZOc6ddIWocMl3l0ct5Ow6yaPTdN8b6SAAK/6fPa2vFjdPZ9pc63+SQCs/yb/Gk+0FtYjLvuMQ8DoQo7JYhnDnTrYuOd6SMKHXD8s9aHF5HOnLSKME4Te0QuMH9TnWRClMdpCsdV1tQEd1oRJVSOJAGh8715inXvXVtgHGILlQGhA== 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 CY5PR11MB6439.namprd11.prod.outlook.com (2603:10b6:930:34::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.11; Thu, 15 Dec 2022 03:10:35 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::5f56:1bdc:2eae:c041]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::5f56:1bdc:2eae:c041%9]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 03:10:35 +0000 From: "Yao, Jiewen" 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 Thread-Topic: [PATCH] SecurityPkg: deprecate RpmcLib and VariableKeyLib Thread-Index: AQHZEDGvcDayWB7LQEewSucxmREGR65uROEA Date: Thu, 15 Dec 2022 03:10:35 +0000 Message-ID: References: <20221215030223.899-1-jian.j.wang@intel.com> In-Reply-To: <20221215030223.899-1-jian.j.wang@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_|CY5PR11MB6439:EE_ x-ms-office365-filtering-correlation-id: 2e2cba3f-865b-4447-dd27-08dade49ef0a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: z6SqbSQ8PeKUMBoWrWdn1W3zpEF8xmSYiOr+9lpbyihJhi1qR9K+dedM7BIPGi4P9Olxyhn0PE+ceAkYjRvCkqqp6JAuwqW3GLCttF/5msd/RmiKAJajsPBklmYyZLieXh8tTHbyRMGPhsgfULgNmSFrWAXY0QImof5vs+4MaVi/N+wYgDf7IUq9bjF5GSjzcAl2R10xPhW/CVeFHptheNEqVfieGPItAzG5LADU82sdfl5SlyDnp4U4xlxtQ2SRxuCXlwKn5QuoDWXsWxZRKLAvATmrZS+6FWNlUa3UsZrwR5j6EZVmZHWTNnV2xmvxza9Tg223SOOw/SIq9LFbl3CcMyMrvH3mMNpJ5wpO0SkcW/42bO/MihL0n9Dr/+WRUqgC9JI/VPUaM8mUCsFwj4bTDIalJ0hLy0J56sU2dwY8h6ACHye1Dyg9t3qgZwihEVH6ODHK1UXuxvVHSpOdj3/qQDw7RXn6EFg4aHWH6mXI813X7wUHe4c8qOu4CVnNQ90UgBoq280DPbX5NKrffcq3oJSlcTrmfF9pQXe2kX6tuwsIyIDwLCk/EfXl93XNRqBpEt3GnFCEkbaa6wkYI0iEa45Ink2OHkQEd6DbUckNLQUEpg8ScVGP9CFI+8maBGjFCXKBWAtNTDYQWdz9CssQDLXTPg3WfDvCt4WlsaFHrGCzgtEhMup8OmaBL5LJ4vbVP379QXnSpauxAgY99VWzStrwZV4fm7rQVgTTcuQ= 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:(13230022)(376002)(366004)(346002)(39860400002)(396003)(136003)(451199015)(66476007)(15650500001)(83380400001)(26005)(107886003)(186003)(54906003)(316002)(110136005)(9686003)(7696005)(86362001)(38070700005)(5660300002)(122000001)(2906002)(55016003)(966005)(6506007)(33656002)(66446008)(66556008)(4326008)(71200400001)(64756008)(8676002)(66946007)(53546011)(38100700002)(478600001)(41300700001)(52536014)(76116006)(30864003)(82960400001)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jhtYZrEWtz2sWkICeJXFPWChaE68RJBNkrp+RW4YzTgda9IJTNrcd7YqWfv1?= =?us-ascii?Q?94VB7lnMhnqOB7+y8ZaG80XlOEwFjcaTHRNNPGwFa8FW5SfexArfi7J1AGLF?= =?us-ascii?Q?pTm1Hntew8RldkvL86TNNV0W/K4dUlwBlVdiWK6kVk589prqi3W+oNnTTx7c?= =?us-ascii?Q?yiDbOAWUpCJjOrlJ88pcHLlaFPX1bI1sdhvrQxOI042JrsAxzVVmRjoavWj3?= =?us-ascii?Q?nnZEuvOBSJmZ/qG/JObO7PcN0T2kF5Lh/LEMADB0zT811KQPoeLU5OgevAds?= =?us-ascii?Q?mjzOFmMzYXRS3hg2XvC0rM3elkRzLXT/y0d24QK4LHBGVFt1PDWd49erJdsp?= =?us-ascii?Q?oQCSDkNdBRVCnc9erBCeE7q2xj1/SCdM/MkPYEGskTA8U3Oosq6uGWXVcTY/?= =?us-ascii?Q?21QtZzcca0xfFPMLm6rPHlzqpCQG0WA4JPR3CsLz2+gXJKvl/Gaw7HZ9ga9C?= =?us-ascii?Q?l8ibn+sc/WavM0xsGZ6GbHhVRe0p/RwDHwL+XQuYa9+rkPU93ihVGapQVI8l?= =?us-ascii?Q?yhxfnPOOIjN5niJKgrnmPUhPuky7jGLk+BLQdtXAi47J/6GhGKbZyma+4Uw8?= =?us-ascii?Q?esLawWx9E4bZTbZlnEV5QadA+qbQjCj+BC0g83nzX1VdHvmFWsjnhuu7wEvi?= =?us-ascii?Q?xhoIman7lApQ9phU92OXBwtvBHcwShN3pT20E6WJRoweRMJn40jkzRd7JP7y?= =?us-ascii?Q?CBjF6QjLzJX0MhndYdB2tnP+mcgGxS1pVAxQE4tlt6aiotjN6WLW9y0ManMx?= =?us-ascii?Q?p8MzCHEIHqQZG7b/1jTeOUMTmtttoGbuFyaivCRgM3zWMc1GLZu4BwWIetbQ?= =?us-ascii?Q?OjOFcqmvCJhOd/qB6GbUpXp6hXb1j38XzOQcpzP553OV9093YNhxL2nmUDA+?= =?us-ascii?Q?8fU3plXxK21Q3yx0Lr7yHMj3uvsGfeMlTq/RrakUFeZ5kC8XsZMXtpPSJbxF?= =?us-ascii?Q?irEF5RcWze8b3B2yAvTzFoRehxmWO2GZ817MwMZaOA9m1DzzvX856XcoNUPh?= =?us-ascii?Q?aPGq0PrRyB5akaLobcKUY0kfJbvqN+FKeYjvA3sARNN8cSSuKv4Q5fbGou2F?= =?us-ascii?Q?L8O0hHsK5yEqmDxmITKgVGn7LPHpIjHyzZthkUlHDJzxeTZSfi1BIZ74DLh/?= =?us-ascii?Q?RfjMq2t4WlL2NCyUu+mvgQfl+IkOXMDAPpZOyaiGQlgyDZaeXlsl5XqSVdWG?= =?us-ascii?Q?fvrbmSO4hRCpl9qZ9ezRV4PdyK+W9q7x1LL5WCBUhjE5JJ+x2BxfCbKWeY2V?= =?us-ascii?Q?NXiQkLMzc4zFB9ZH/B1i7wuN3/xG4xcArIaKOQ/DWPSohRxtP2BmhcksnQvi?= =?us-ascii?Q?8JJgLT/Y80L8lqihw6Y3MkZGaYCdoWu/s6nj4GUuFQZcCxY5TpSfq0/6ECQ3?= =?us-ascii?Q?3XBjhWwWqlojvoLZum27SY3LxrMX7JY7WjPZpJVwMOmGdODD/Q18yFgIMCHI?= =?us-ascii?Q?vcMskhV3UnYV3ZK0PdYd3w7qt5IoqbGdGWiY3arK/onccshHkhPMKiCJ+UPr?= =?us-ascii?Q?5rgRkP6dO0/gvndwrFzrAR0A2PIZyu5vWjTD1RxEEZ2KRGzBVupD4iC+YVia?= =?us-ascii?Q?ZRbBlNlcg8LY4KWxO6LKMoHBOzUOozFinFC0Y2vD?= 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: 2e2cba3f-865b-4447-dd27-08dade49ef0a X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2022 03:10:35.0323 (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: m+Q3t/wxvP7WfES1p4KKLgE9SxW+ucuJF2sj09sfGJubvPPagqiXq0M4b+F7xGCiTjwNEwjXwUjZeoZHPXCWCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6439 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 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 > ; Mistry, Nishant C > ; 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 ----------------- > 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 (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 th= e > 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 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 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 a/SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.in= f > 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 th= e > 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 > 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 > index 30d911d8a1..2f679c87a9 100644 > --- a/SecurityPkg/SecurityPkg.dsc > +++ b/SecurityPkg/SecurityPkg.dsc > @@ -68,8 +68,6 @@ >=20 > TcgStorageCoreLib|SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCoreLi > b.inf >=20 >=20 > TcgStorageOpalLib|SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLi > b.inf >=20 >=20 > ResetSystemLib|MdeModulePkg/Library/BaseResetSystemLibNull/BaseReset > SystemLibNull.inf >=20 > - > VariableKeyLib|SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull.= in > f >=20 > - RpmcLib|SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf >=20 >=20 > TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventL > ogRecordLib.inf >=20 >=20 > MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnbloc > kMemoryLibNull.inf >=20 >=20 > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBo > 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/PlatformPKProtection= L > ibVarPolicy.inf >=20 >=20 >=20 > # >=20 > -- > 2.36.1.windows.1