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 <star.zeng@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17772 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -39,16 +39,16 @@ AutenticatedVariableServiceInitialize (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
VARIABLE_POINTER_TRACK Variable;
|
||||
UINT8 VarValue;
|
||||
UINT32 VarAttr;
|
||||
UINTN DataSize;
|
||||
UINTN CtxSize;
|
||||
VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
EFI_STATUS Status;
|
||||
VARIABLE_POINTER_TRACK Variable;
|
||||
UINT8 VarValue;
|
||||
UINT32 VarAttr;
|
||||
UINTN DataSize;
|
||||
UINTN CtxSize;
|
||||
AUTHENTICATED_VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
|
||||
ZeroMem (&VariableHeader, sizeof (VARIABLE_HEADER));
|
||||
ZeroMem (&VariableHeader, sizeof (AUTHENTICATED_VARIABLE_HEADER));
|
||||
|
||||
mVariableModuleGlobal->AuthenticatedVariableGuid[Physical] = &gEfiAuthenticatedVariableGuid;
|
||||
mVariableModuleGlobal->CertRsa2048Sha256Guid[Physical] = &gEfiCertRsa2048Sha256Guid;
|
||||
@@ -477,16 +477,16 @@ ProcessVarWithPk (
|
||||
IN BOOLEAN IsPk
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
VARIABLE_POINTER_TRACK PkVariable;
|
||||
EFI_SIGNATURE_LIST *OldPkList;
|
||||
EFI_SIGNATURE_DATA *OldPkData;
|
||||
EFI_VARIABLE_AUTHENTICATION *CertData;
|
||||
VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
EFI_STATUS Status;
|
||||
VARIABLE_POINTER_TRACK PkVariable;
|
||||
EFI_SIGNATURE_LIST *OldPkList;
|
||||
EFI_SIGNATURE_DATA *OldPkData;
|
||||
EFI_VARIABLE_AUTHENTICATION *CertData;
|
||||
AUTHENTICATED_VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
|
||||
OldPkList = NULL;
|
||||
ZeroMem (&VariableHeader, sizeof (VARIABLE_HEADER));
|
||||
ZeroMem (&VariableHeader, sizeof (AUTHENTICATED_VARIABLE_HEADER));
|
||||
|
||||
if ((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0) {
|
||||
//
|
||||
@@ -622,11 +622,11 @@ ProcessVarWithKek (
|
||||
EFI_CERT_BLOCK_RSA_2048_SHA256 *CertBlock;
|
||||
BOOLEAN IsFound;
|
||||
UINT32 Index;
|
||||
VARIABLE_HEADER VariableHeader;
|
||||
AUTHENTICATED_VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
|
||||
KekList = NULL;
|
||||
ZeroMem (&VariableHeader, sizeof (VARIABLE_HEADER));
|
||||
ZeroMem (&VariableHeader, sizeof (AUTHENTICATED_VARIABLE_HEADER));
|
||||
|
||||
if (mPlatformMode == USER_MODE) {
|
||||
if ((Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) == 0) {
|
||||
@@ -771,7 +771,7 @@ VerifyVariable (
|
||||
UINT8 *PubKey;
|
||||
EFI_VARIABLE_AUTHENTICATION *CertData;
|
||||
EFI_CERT_BLOCK_RSA_2048_SHA256 *CertBlock;
|
||||
VARIABLE_HEADER VariableHeader;
|
||||
AUTHENTICATED_VARIABLE_HEADER VariableHeader;
|
||||
BOOLEAN Valid;
|
||||
|
||||
CertData = NULL;
|
||||
@@ -786,7 +786,7 @@ VerifyVariable (
|
||||
//
|
||||
// Determine if first time SetVariable with the EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS.
|
||||
//
|
||||
ZeroMem (&VariableHeader, sizeof (VARIABLE_HEADER));
|
||||
ZeroMem (&VariableHeader, sizeof (AUTHENTICATED_VARIABLE_HEADER));
|
||||
if (Variable->CurrPtr != 0x0) {
|
||||
Valid = IsValidVariableHeader (
|
||||
Variable->CurrPtr,
|
||||
|
Reference in New Issue
Block a user