From 7ae77cee9627f417b3bbcc3334d3823ff248a3f5 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 1 Jul 2015 03:13:02 +0000 Subject: SecurityPkg: Delete Auth Variable driver 1. Delete TpmMeasurementLib LibraryClass from SecurityPkg after it moved to MdeModulePkg. 2. Update DxeTpmMeasurementLib.inf to include MdeModulePkg.dec. 3. Delete authenticated variable definition from AuthenticatedVariableFormat.h after them moved to VariableFormat.h. 4. Replace VARIABLE_HEADER with AUTHENTICATED_VARIABLE_HEADER in EsalVariableDxeSal. 5. Delete VariableInfo from SecurityPkg after it merged to VariableInfo in MdeModulePkg. 6. Delete VariablePei from SecurityPkg after it merged to VariablePei in MdeModulePkg. 7. Delete Auth Variable driver from SecurityPkg after it merged to Variable driver in MdeModulePkg. 8. Also update PACKAGE_GUID and PACKAGE_VERSION in SecurityPkg.dec after the deletion of authenticated variable definition, VariableInfo, VariablePei and Auth Variable driver from SecurityPkg; update PLATFORM_VERSION in SecurityPkg.dsc. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Jiewen Yao Reviewed-by: Liming Gao Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17772 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Application/VariableInfo/VariableInfo.c | 265 --------------------- .../Application/VariableInfo/VariableInfo.inf | 63 ----- .../Application/VariableInfo/VariableInfo.uni | Bin 2902 -> 0 bytes .../Application/VariableInfo/VariableInfoExtra.uni | Bin 1360 -> 0 bytes 4 files changed, 328 deletions(-) delete mode 100644 SecurityPkg/Application/VariableInfo/VariableInfo.c delete mode 100644 SecurityPkg/Application/VariableInfo/VariableInfo.inf delete mode 100644 SecurityPkg/Application/VariableInfo/VariableInfo.uni delete mode 100644 SecurityPkg/Application/VariableInfo/VariableInfoExtra.uni (limited to 'SecurityPkg/Application') diff --git a/SecurityPkg/Application/VariableInfo/VariableInfo.c b/SecurityPkg/Application/VariableInfo/VariableInfo.c deleted file mode 100644 index 0c1ee4b0f8..0000000000 --- a/SecurityPkg/Application/VariableInfo/VariableInfo.c +++ /dev/null @@ -1,265 +0,0 @@ -/** @file - If the Variable services have PcdVariableCollectStatistics set to TRUE then - this utility will print out the statistics information. You can use console - redirection to capture the data. - -Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -extern EFI_GUID gEfiVariableGuid; -EFI_SMM_COMMUNICATION_PROTOCOL *mSmmCommunication = NULL; - -/** - - This function get the variable statistics data from SMM variable driver. - - @param[in, out] SmmCommunicateHeader In input, a pointer to a collection of data that will - be passed into an SMM environment. In output, a pointer - to a collection of data that comes from an SMM environment. - @param[in, out] SmmCommunicateSize The size of the SmmCommunicateHeader. - - @retval EFI_SUCCESS Get the statistics data information. - @retval EFI_NOT_FOUND Not found. - @retval EFI_BUFFER_TO_SMALL DataSize is too small for the result. - -**/ -EFI_STATUS -EFIAPI -GetVariableStatisticsData ( - IN OUT EFI_SMM_COMMUNICATE_HEADER *SmmCommunicateHeader, - IN OUT UINTN *SmmCommunicateSize - ) -{ - EFI_STATUS Status; - SMM_VARIABLE_COMMUNICATE_HEADER *SmmVariableFunctionHeader; - - CopyGuid (&SmmCommunicateHeader->HeaderGuid, &gEfiSmmVariableProtocolGuid); - SmmCommunicateHeader->MessageLength = *SmmCommunicateSize - OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data); - - SmmVariableFunctionHeader = (SMM_VARIABLE_COMMUNICATE_HEADER *) &SmmCommunicateHeader->Data[0]; - SmmVariableFunctionHeader->Function = SMM_VARIABLE_FUNCTION_GET_STATISTICS; - - Status = mSmmCommunication->Communicate (mSmmCommunication, SmmCommunicateHeader, SmmCommunicateSize); - ASSERT_EFI_ERROR (Status); - - Status = SmmVariableFunctionHeader->ReturnStatus; - return Status; -} - - -/** - - This function get and print the variable statistics data from SMM variable driver. - - @retval EFI_SUCCESS Print the statistics information successfully. - @retval EFI_NOT_FOUND Not found the statistics information. - -**/ -EFI_STATUS -PrintInfoFromSmm ( - VOID - ) -{ - EFI_STATUS Status; - VARIABLE_INFO_ENTRY *VariableInfo; - EFI_SMM_COMMUNICATE_HEADER *CommBuffer; - UINTN RealCommSize; - UINTN CommSize; - SMM_VARIABLE_COMMUNICATE_HEADER *FunctionHeader; - EFI_SMM_VARIABLE_PROTOCOL *Smmvariable; - - - Status = gBS->LocateProtocol (&gEfiSmmVariableProtocolGuid, NULL, (VOID **) &Smmvariable); - if (EFI_ERROR (Status)) { - return Status; - } - - Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication); - if (EFI_ERROR (Status)) { - return Status; - } - - CommSize = SMM_COMMUNICATE_HEADER_SIZE + SMM_VARIABLE_COMMUNICATE_HEADER_SIZE; - RealCommSize = CommSize; - CommBuffer = AllocateZeroPool (CommSize); - ASSERT (CommBuffer != NULL); - - Print (L"Non-Volatile SMM Variables:\n"); - do { - Status = GetVariableStatisticsData (CommBuffer, &CommSize); - if (Status == EFI_BUFFER_TOO_SMALL) { - FreePool (CommBuffer); - CommBuffer = AllocateZeroPool (CommSize); - ASSERT (CommBuffer != NULL); - RealCommSize = CommSize; - Status = GetVariableStatisticsData (CommBuffer, &CommSize); - } - - if (EFI_ERROR (Status) || (CommSize <= SMM_COMMUNICATE_HEADER_SIZE + SMM_VARIABLE_COMMUNICATE_HEADER_SIZE)) { - break; - } - - if (CommSize < RealCommSize) { - CommSize = RealCommSize; - } - - FunctionHeader = (SMM_VARIABLE_COMMUNICATE_HEADER *) CommBuffer->Data; - VariableInfo = (VARIABLE_INFO_ENTRY *) FunctionHeader->Data; - - if (!VariableInfo->Volatile) { - Print ( - L"%g R%03d(%03d) W%03d D%03d:%s\n", - &VariableInfo->VendorGuid, - VariableInfo->ReadCount, - VariableInfo->CacheCount, - VariableInfo->WriteCount, - VariableInfo->DeleteCount, - (CHAR16 *)(VariableInfo + 1) - ); - } - } while (TRUE); - - Print (L"Volatile SMM Variables:\n"); - ZeroMem (CommBuffer, CommSize); - do { - Status = GetVariableStatisticsData (CommBuffer, &CommSize); - if (Status == EFI_BUFFER_TOO_SMALL) { - FreePool (CommBuffer); - CommBuffer = AllocateZeroPool (CommSize); - ASSERT (CommBuffer != NULL); - RealCommSize = CommSize; - Status = GetVariableStatisticsData (CommBuffer, &CommSize); - } - - if (EFI_ERROR (Status) || (CommSize <= SMM_COMMUNICATE_HEADER_SIZE + SMM_VARIABLE_COMMUNICATE_HEADER_SIZE)) { - break; - } - - if (CommSize < RealCommSize) { - CommSize = RealCommSize; - } - - FunctionHeader = (SMM_VARIABLE_COMMUNICATE_HEADER *) CommBuffer->Data; - VariableInfo = (VARIABLE_INFO_ENTRY *) FunctionHeader->Data; - - if (VariableInfo->Volatile) { - Print ( - L"%g R%03d(%03d) W%03d D%03d:%s\n", - &VariableInfo->VendorGuid, - VariableInfo->ReadCount, - VariableInfo->CacheCount, - VariableInfo->WriteCount, - VariableInfo->DeleteCount, - (CHAR16 *)(VariableInfo + 1) - ); - } - } while (TRUE); - - FreePool (CommBuffer); - return Status; -} - -/** - The user Entry Point for Application. The user code starts with this function - as the real entry point for the image goes into a library that calls this - function. - - @param[in] ImageHandle The firmware allocated handle for the EFI image. - @param[in] SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - @retval other Some error occurs when executing this entry point. - -**/ -EFI_STATUS -EFIAPI -UefiMain ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - VARIABLE_INFO_ENTRY *VariableInfo; - VARIABLE_INFO_ENTRY *Entry; - - Status = EfiGetSystemConfigurationTable (&gEfiVariableGuid, (VOID **)&Entry); - if (EFI_ERROR (Status) || (Entry == NULL)) { - Status = EfiGetSystemConfigurationTable (&gEfiAuthenticatedVariableGuid, (VOID **)&Entry); - } - - if (EFI_ERROR (Status) || (Entry == NULL)) { - Status = PrintInfoFromSmm (); - if (!EFI_ERROR (Status)) { - return Status; - } - } - - if (!EFI_ERROR (Status) && (Entry != NULL)) { - Print (L"Non-Volatile EFI Variables:\n"); - VariableInfo = Entry; - do { - if (!VariableInfo->Volatile) { - Print ( - L"%g R%03d(%03d) W%03d D%03d:%s\n", - &VariableInfo->VendorGuid, - VariableInfo->ReadCount, - VariableInfo->CacheCount, - VariableInfo->WriteCount, - VariableInfo->DeleteCount, - VariableInfo->Name - ); - } - - VariableInfo = VariableInfo->Next; - } while (VariableInfo != NULL); - - Print (L"Volatile EFI Variables:\n"); - VariableInfo = Entry; - do { - if (VariableInfo->Volatile) { - Print ( - L"%g R%03d(%03d) W%03d D%03d:%s\n", - &VariableInfo->VendorGuid, - VariableInfo->ReadCount, - VariableInfo->CacheCount, - VariableInfo->WriteCount, - VariableInfo->DeleteCount, - VariableInfo->Name - ); - } - VariableInfo = VariableInfo->Next; - } while (VariableInfo != NULL); - - } else { - Print (L"Warning: Variable Dxe driver doesn't enable the feature of statistical information!\n"); - Print (L"If you want to see this info, please:\n"); - Print (L" 1. Set PcdVariableCollectStatistics as TRUE\n"); - Print (L" 2. Rebuild Variable Dxe driver\n"); - Print (L" 3. Run \"VariableInfo\" cmd again\n"); - } - - return Status; -} diff --git a/SecurityPkg/Application/VariableInfo/VariableInfo.inf b/SecurityPkg/Application/VariableInfo/VariableInfo.inf deleted file mode 100644 index d4a771a908..0000000000 --- a/SecurityPkg/Application/VariableInfo/VariableInfo.inf +++ /dev/null @@ -1,63 +0,0 @@ -## @file -# A shell application that displays statistical information about variable usage -# -# This application can display statistical information about variable usage for SMM variable -# driver and non-SMM variable driver. -# Note that if Variable Dxe driver doesn't enable the feature by setting PcdVariableCollectStatistics -# as TRUE, the application will not display variable statistical information. -# -# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
-# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = VariableInfo - MODULE_UNI_FILE = VariableInfo.uni - FILE_GUID = B9EF901F-A2A2-4fc8-8D2B-3A2E07B301CC - MODULE_TYPE = UEFI_APPLICATION - VERSION_STRING = 1.0 - ENTRY_POINT = UefiMain - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -[Sources] - VariableInfo.c - - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - SecurityPkg/SecurityPkg.dec - -[LibraryClasses] - UefiApplicationEntryPoint - UefiLib - UefiBootServicesTableLib - BaseMemoryLib - MemoryAllocationLib - -[Protocols] - gEfiSmmCommunicationProtocolGuid ## SOMETIMES_CONSUMES - - ## UNDEFINED # Used to do smm communication - ## SOMETIMES_CONSUMES - gEfiSmmVariableProtocolGuid - -[Guids] - gEfiAuthenticatedVariableGuid ## SOMETIMES_CONSUMES ## SystemTable - gEfiVariableGuid ## CONSUMES ## SystemTable - -[UserExtensions.TianoCore."ExtraFiles"] - VariableInfoExtra.uni - \ No newline at end of file diff --git a/SecurityPkg/Application/VariableInfo/VariableInfo.uni b/SecurityPkg/Application/VariableInfo/VariableInfo.uni deleted file mode 100644 index e2f214b615..0000000000 Binary files a/SecurityPkg/Application/VariableInfo/VariableInfo.uni and /dev/null differ diff --git a/SecurityPkg/Application/VariableInfo/VariableInfoExtra.uni b/SecurityPkg/Application/VariableInfo/VariableInfoExtra.uni deleted file mode 100644 index b7fd354c45..0000000000 Binary files a/SecurityPkg/Application/VariableInfo/VariableInfoExtra.uni and /dev/null differ -- cgit v1.2.3