Revision: 16435
http://sourceforge.net/p/edk2/code/16435
Author: vanjeff
Date: 2014-11-25 07:34:36 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Sync patch r16320 from main trunk.
Fix execution status & DEBUG message level mismatch. EFI_D_ERROR is used only
when failure/case can't be resolved by code.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <[email protected]>
Reviewed-by: Dong Guo <[email protected]>
(cherry picked from commit c70d19067cfb95bf4d1de4963d1b3480ccaf36e0)
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/16320
Modified Paths:
--------------
branches/UDK2014.SP1/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
branches/UDK2014.SP1/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
branches/UDK2014.SP1/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
branches/UDK2014.SP1/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
branches/UDK2014.SP1/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
branches/UDK2014.SP1/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1,7 +1,7 @@
/** @file
Implement defer image load services for user identification in UEFI2.2.
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -853,7 +853,7 @@
return EFI_SUCCESS;
}
- DEBUG ((EFI_D_ERROR, "[Security] No user identified, the image is deferred
to load!\n"));
+ DEBUG ((EFI_D_INFO, "[Security] No user identified, the image is deferred to
load!\n"));
PutDefferedImageInfo (File, FileBuffer, FileSize);
//
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1,7 +1,7 @@
/** @file
Measure TrEE required variable.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -312,7 +312,7 @@
Data,
DataSize
);
- DEBUG ((EFI_D_ERROR, "MeasureBootPolicyVariable - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "MeasureBootPolicyVariable - %r\n", Status));
if (!EFI_ERROR (Status)) {
AddDataMeasured (VariableName, VendorGuid, Data, DataSize);
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -509,7 +509,7 @@
// Measure GPT disk.
//
Status = TrEEMeasureGptTable (TreeProtocol, Handle);
- DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler -
TrEEMeasureGptTable - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler -
TrEEMeasureGptTable - %r\n", Status));
if (!EFI_ERROR (Status)) {
//
// GPT disk check done.
@@ -653,7 +653,7 @@
ImageContext.ImageType,
DevicePathNode
);
- DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler - TrEEMeasurePeImage -
%r\n", Status));
+ DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - TrEEMeasurePeImage -
%r\n", Status));
}
//
@@ -664,7 +664,7 @@
FreePool (OrigDevicePathNode);
}
- DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - %r\n", Status));
return Status;
}
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -91,15 +91,15 @@
CopyMem (LocalAuthSession.hmac.buffer, PlatformAuth->buffer,
PlatformAuth->size);
}
- DEBUG ((EFI_D_ERROR, "Tpm2ClearControl ... \n"));
+ DEBUG ((EFI_D_INFO, "Tpm2ClearControl ... \n"));
Status = Tpm2ClearControl (TPM_RH_PLATFORM, AuthSession, NO);
- DEBUG ((EFI_D_ERROR, "Tpm2ClearControl - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "Tpm2ClearControl - %r\n", Status));
if (EFI_ERROR (Status)) {
goto Done;
}
- DEBUG ((EFI_D_ERROR, "Tpm2Clear ... \n"));
+ DEBUG ((EFI_D_INFO, "Tpm2Clear ... \n"));
Status = Tpm2Clear (TPM_RH_PLATFORM, AuthSession);
- DEBUG ((EFI_D_ERROR, "Tpm2Clear - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "Tpm2Clear - %r\n", Status));
Done:
ZeroMem (&LocalAuthSession.hmac, sizeof(LocalAuthSession.hmac));
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -3,7 +3,7 @@
hash handler registerd, such as SHA1, SHA256.
Platform can use PcdTpm2HashMask to mask some hash engines.
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved. <BR>
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
@@ -275,7 +275,7 @@
//
// In PEI phase, there will be shadow driver dispatched again.
//
- DEBUG ((EFI_D_ERROR, "RegisterHashInterfaceLib - Override\n"));
+ DEBUG ((EFI_D_INFO, "RegisterHashInterfaceLib - Override\n"));
CopyMem (&HashInterfaceHob->HashInterface[Index], HashInterface,
sizeof(*HashInterface));
return EFI_SUCCESS;
}
Modified:
branches/UDK2014.SP1/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -129,7 +129,7 @@
//
// In PEI phase, there will be shadow driver dispatched again.
//
- DEBUG ((EFI_D_ERROR, "Tpm2RegisterTpm2DeviceLib - Override\n"));
+ DEBUG ((EFI_D_INFO, "Tpm2RegisterTpm2DeviceLib - Override\n"));
CopyMem (Tpm2DeviceInterface, Tpm2Device, sizeof(*Tpm2Device));
return EFI_SUCCESS;
} else {
Modified: branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
===================================================================
--- branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
2014-11-25 07:32:22 UTC (rev 16434)
+++ branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -46,7 +46,7 @@
DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm not present\n"));
return FALSE;
} else {
- DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm present\n"));
+ DEBUG ((EFI_D_INFO, "DetectTpmDevice: Dtpm present\n"));
return TRUE;
}
}
@@ -76,7 +76,7 @@
// In S3, we rely on normal boot Detection, because we save to ReadOnly
Variable in normal boot.
//
if (BootMode == BOOT_ON_S3_RESUME) {
- DEBUG ((EFI_D_ERROR, "DetectTpmDevice: S3 mode\n"));
+ DEBUG ((EFI_D_INFO, "DetectTpmDevice: S3 mode\n"));
Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL,
(VOID **) &VariablePpi);
ASSERT_EFI_ERROR (Status);
@@ -99,7 +99,7 @@
}
}
- DEBUG ((EFI_D_ERROR, "DetectTpmDevice:\n"));
+ DEBUG ((EFI_D_INFO, "DetectTpmDevice:\n"));
if (!IsDtpmPresent ()) {
// dTPM not available
return TPM_DEVICE_NULL;
Modified: branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
===================================================================
--- branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
2014-11-25 07:32:22 UTC (rev 16434)
+++ branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1,7 +1,7 @@
/** @file
The module entry point for TrEE configuration module.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -101,11 +101,11 @@
//
// Although we have SetupVariable info, we still need detect TPM device
manually.
//
- DEBUG ((EFI_D_ERROR, "TrEEConfiguration.TpmDevice from Setup: %x\n",
TrEEConfiguration.TpmDevice));
+ DEBUG ((EFI_D_INFO, "TrEEConfiguration.TpmDevice from Setup: %x\n",
TrEEConfiguration.TpmDevice));
if (PcdGetBool (PcdTpmAutoDetection)) {
TpmDevice = DetectTpmDevice (TrEEConfiguration.TpmDevice);
- DEBUG ((EFI_D_ERROR, "TpmDevice final: %x\n", TpmDevice));
+ DEBUG ((EFI_D_INFO, "TpmDevice final: %x\n", TpmDevice));
if (TpmDevice != TPM_DEVICE_NULL) {
TrEEConfiguration.TpmDevice = TpmDevice;
}
@@ -125,7 +125,7 @@
if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {
Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);
PcdSetPtr (PcdTpmInstanceGuid, &Size,
&mTpmInstanceId[Index].TpmInstanceGuid);
- DEBUG ((EFI_D_ERROR, "TpmDevice PCD: %g\n",
&mTpmInstanceId[Index].TpmInstanceGuid));
+ DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n",
&mTpmInstanceId[Index].TpmInstanceGuid));
break;
}
}
Modified: branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
===================================================================
--- branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c 2014-11-25
07:32:22 UTC (rev 16434)
+++ branches/UDK2014.SP1/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c 2014-11-25
07:34:36 UTC (rev 16435)
@@ -364,7 +364,7 @@
IN OUT TREE_BOOT_SERVICE_CAPABILITY *ProtocolCapability
)
{
- DEBUG ((EFI_D_ERROR, "TreeGetCapability ...\n"));
+ DEBUG ((EFI_D_INFO, "TreeGetCapability ...\n"));
if ((This == NULL) || (ProtocolCapability == NULL)) {
return EFI_INVALID_PARAMETER;
@@ -376,7 +376,7 @@
}
CopyMem (ProtocolCapability, &mTcgDxeData.BsCap, mTcgDxeData.BsCap.Size);
- DEBUG ((EFI_D_ERROR, "TreeGetCapability - %r\n", EFI_SUCCESS));
+ DEBUG ((EFI_D_INFO, "TreeGetCapability - %r\n", EFI_SUCCESS));
return EFI_SUCCESS;
}
@@ -451,7 +451,7 @@
{
UINTN Index;
- DEBUG ((EFI_D_ERROR, "TreeGetEventLog ...\n"));
+ DEBUG ((EFI_D_INFO, "TreeGetEventLog ...\n"));
if (This == NULL) {
return EFI_INVALID_PARAMETER;
@@ -482,7 +482,7 @@
if (EventLogLocation != NULL) {
*EventLogLocation = mTcgDxeData.EventLogAreaStruct[Index].Lasa;
- DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogLocation - %x)\n",
*EventLogLocation));
+ DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogLocation - %x)\n",
*EventLogLocation));
}
if (EventLogLastEntry != NULL) {
@@ -491,15 +491,15 @@
} else {
*EventLogLastEntry =
(EFI_PHYSICAL_ADDRESS)(UINTN)mTcgDxeData.EventLogAreaStruct[Index].LastEvent;
}
- DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogLastEntry - %x)\n",
*EventLogLastEntry));
+ DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogLastEntry - %x)\n",
*EventLogLastEntry));
}
if (EventLogTruncated != NULL) {
*EventLogTruncated =
mTcgDxeData.EventLogAreaStruct[Index].EventLogTruncated;
- DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogTruncated - %x)\n",
*EventLogTruncated));
+ DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogTruncated - %x)\n",
*EventLogTruncated));
}
- DEBUG ((EFI_D_ERROR, "TreeGetEventLog - %r\n", EFI_SUCCESS));
+ DEBUG ((EFI_D_INFO, "TreeGetEventLog - %r\n", EFI_SUCCESS));
// Dump Event Log for debug purpose
if ((EventLogLocation != NULL) && (EventLogLastEntry != NULL)) {
@@ -860,7 +860,7 @@
TCG_PCR_EVENT_HDR NewEventHdr;
TPML_DIGEST_VALUES DigestList;
- DEBUG ((EFI_D_ERROR, "TreeHashLogExtendEvent ...\n"));
+ DEBUG ((EFI_D_INFO, "TreeHashLogExtendEvent ...\n"));
if ((This == NULL) || (DataToHash == 0) || (Event == NULL)) {
return EFI_INVALID_PARAMETER;
@@ -902,7 +902,7 @@
Event->Event
);
}
- DEBUG ((EFI_D_ERROR, "TreeHashLogExtendEvent - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "TreeHashLogExtendEvent - %r\n", Status));
return Status;
}
@@ -932,7 +932,7 @@
{
EFI_STATUS Status;
- DEBUG ((EFI_D_ERROR, "TreeSubmitCommand ...\n"));
+ DEBUG ((EFI_D_INFO, "TreeSubmitCommand ...\n"));
if ((This == NULL) ||
(InputParameterBlockSize == 0) || (InputParameterBlock == NULL) ||
@@ -957,7 +957,7 @@
&OutputParameterBlockSize,
OutputParameterBlock
);
- DEBUG ((EFI_D_ERROR, "TreeSubmitCommand - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "TreeSubmitCommand - %r\n", Status));
return Status;
}
@@ -1178,7 +1178,7 @@
TCG_PCR_EVENT_HDR TcgEvent;
UINT32 EventData;
- DEBUG ((EFI_D_ERROR, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));
+ DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));
EventData = 0;
TcgEvent.PCRIndex = PCRIndex;
@@ -1223,8 +1223,8 @@
UINTN VarNameLength;
EFI_VARIABLE_DATA_TREE *VarLog;
- DEBUG ((EFI_D_ERROR, "TrEEDxe: MeasureVariable (Pcr - %x, EventType - %x, ",
(UINTN)PCRIndex, (UINTN)EventType));
- DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName,
VendorGuid));
+ DEBUG ((EFI_D_INFO, "TrEEDxe: MeasureVariable (Pcr - %x, EventType - %x, ",
(UINTN)PCRIndex, (UINTN)EventType));
+ DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName,
VendorGuid));
VarNameLength = StrLen (VarName);
TcgEvent.PCRIndex = PCRIndex;
@@ -1553,11 +1553,11 @@
if (PcdGetBool (PcdFirmwareDebuggerInitialized)) {
Status = MeasureLaunchOfFirmwareDebugger ();
- DEBUG ((EFI_D_ERROR, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));
}
Status = MeasureAllSecureVariables ();
- DEBUG ((EFI_D_ERROR, "MeasureAllSecureVariables - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "MeasureAllSecureVariables - %r\n", Status));
//
// We need measure Separator(7) here, because this event must be between
SecureBootPolicy (Configure)
@@ -1566,7 +1566,7 @@
// the Authority measurement happen before ReadToBoot event.
//
Status = MeasureSeparatorEvent (7);
- DEBUG ((EFI_D_ERROR, "MeasureSeparatorEvent - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent - %r\n", Status));
return ;
}
@@ -1862,14 +1862,14 @@
//
// Fill information
//
- DEBUG ((EFI_D_ERROR, "TrEE.ProtocolVersion - %02x.%02x\n",
mTcgDxeData.BsCap.ProtocolVersion.Major,
mTcgDxeData.BsCap.ProtocolVersion.Minor));
- DEBUG ((EFI_D_ERROR, "TrEE.StructureVersion - %02x.%02x\n",
mTcgDxeData.BsCap.StructureVersion.Major,
mTcgDxeData.BsCap.StructureVersion.Minor));
+ DEBUG ((EFI_D_INFO, "TrEE.ProtocolVersion - %02x.%02x\n",
mTcgDxeData.BsCap.ProtocolVersion.Major,
mTcgDxeData.BsCap.ProtocolVersion.Minor));
+ DEBUG ((EFI_D_INFO, "TrEE.StructureVersion - %02x.%02x\n",
mTcgDxeData.BsCap.StructureVersion.Major,
mTcgDxeData.BsCap.StructureVersion.Minor));
Status = Tpm2GetCapabilityManufactureID (&mTcgDxeData.BsCap.ManufacturerID);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityManufactureID fail!\n"));
} else {
- DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityManufactureID - %08x\n",
mTcgDxeData.BsCap.ManufacturerID));
+ DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityManufactureID - %08x\n",
mTcgDxeData.BsCap.ManufacturerID));
}
DEBUG_CODE (
@@ -1880,7 +1880,7 @@
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityFirmwareVersion fail!\n"));
} else {
- DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n",
FirmwareVersion1, FirmwareVersion2));
+ DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n",
FirmwareVersion1, FirmwareVersion2));
}
);
@@ -1890,7 +1890,7 @@
} else {
mTcgDxeData.BsCap.MaxCommandSize = (UINT16)MaxCommandSize;
mTcgDxeData.BsCap.MaxResponseSize = (UINT16)MaxResponseSize;
- DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityMaxCommandResponseSize - %08x,
%08x\n", MaxCommandSize, MaxResponseSize));
+ DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityMaxCommandResponseSize - %08x,
%08x\n", MaxCommandSize, MaxResponseSize));
}
Status = Tpm2GetCapabilityPcrs (&Pcrs);
@@ -1898,10 +1898,10 @@
DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityPcrs fail!\n"));
TpmHashAlgorithmBitmap = TREE_BOOT_HASH_ALG_SHA1;
} else {
- DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityPcrs Count - %08x\n", Pcrs.count));
+ DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityPcrs Count - %08x\n", Pcrs.count));
TpmHashAlgorithmBitmap = 0;
for (Index = 0; Index < Pcrs.count; Index++) {
- DEBUG ((EFI_D_ERROR, "hash - %x\n", Pcrs.pcrSelections[Index].hash));
+ DEBUG ((EFI_D_INFO, "hash - %x\n", Pcrs.pcrSelections[Index].hash));
switch (Pcrs.pcrSelections[Index].hash) {
case TPM_ALG_SHA1:
TpmHashAlgorithmBitmap |= TREE_BOOT_HASH_ALG_SHA1;
@@ -1921,11 +1921,11 @@
}
}
}
- DEBUG ((EFI_D_ERROR, "TPM.HashAlgorithmBitmap - 0x%08x\n",
TpmHashAlgorithmBitmap));
+ DEBUG ((EFI_D_INFO, "TPM.HashAlgorithmBitmap - 0x%08x\n",
TpmHashAlgorithmBitmap));
- DEBUG ((EFI_D_ERROR, "TrEE.SupportedEventLogs - 0x%08x\n",
mTcgDxeData.BsCap.SupportedEventLogs));
+ DEBUG ((EFI_D_INFO, "TrEE.SupportedEventLogs - 0x%08x\n",
mTcgDxeData.BsCap.SupportedEventLogs));
mTcgDxeData.BsCap.HashAlgorithmBitmap = TpmHashAlgorithmBitmap;
- DEBUG ((EFI_D_ERROR, "TrEE.HashAlgorithmBitmap - 0x%08x\n",
mTcgDxeData.BsCap.HashAlgorithmBitmap));
+ DEBUG ((EFI_D_INFO, "TrEE.HashAlgorithmBitmap - 0x%08x\n",
mTcgDxeData.BsCap.HashAlgorithmBitmap));
if (mTcgDxeData.BsCap.TrEEPresentFlag) {
//
@@ -1982,7 +1982,7 @@
// Install TrEEProtocol
//
Status = InstallTrEE ();
- DEBUG ((EFI_D_ERROR, "InstallTrEE - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "InstallTrEE - %r\n", Status));
return Status;
}
Modified:
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1,7 +1,7 @@
/** @file
The implementation of Extended SAL variable services.
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -3244,7 +3244,7 @@
);
} else {
Status = EFI_VOLUME_CORRUPTED;
- DEBUG((EFI_D_INFO, "Variable Store header is corrupted\n"));
+ DEBUG((EFI_D_ERROR, "Variable Store header is corrupted\n"));
}
Done:
Modified:
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1,7 +1,7 @@
/** @file
Measure TrEE required variable.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -118,8 +118,8 @@
);
}
- DEBUG ((EFI_D_ERROR, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType
- %x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));
- DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName,
VendorGuid));
+ DEBUG ((EFI_D_INFO, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType -
%x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));
+ DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName,
VendorGuid));
Status = TpmMeasureAndLogData (
7,
@@ -245,7 +245,7 @@
VariableData,
VariableDataSize
);
- DEBUG ((EFI_D_ERROR, "MeasureBootPolicyVariable - %r\n", Status));
+ DEBUG ((EFI_D_INFO, "MeasureBootPolicyVariable - %r\n", Status));
if (VariableData != NULL) {
FreePool (VariableData);
Modified:
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
2014-11-25 07:32:22 UTC (rev 16434)
+++
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
2014-11-25 07:34:36 UTC (rev 16435)
@@ -1920,7 +1920,7 @@
ZeroMem (OldData, KekDataSize);
while ((KekDataSize > 0) && (KekDataSize >= CertList->SignatureListSize)) {
CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) -
CertList->SignatureHeaderSize) / CertList->SignatureSize;
- DEBUG ((DEBUG_ERROR, " CertCount = %x\n", CertCount));
+ DEBUG ((DEBUG_INFO, " CertCount = %x\n", CertCount));
if (CertCount != 0) {
CopyMem (OldData + Offset, CertList, CertList->SignatureListSize);
Offset += CertList->SignatureListSize;
@@ -2118,7 +2118,7 @@
ZeroMem (OldData, ItemDataSize);
while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {
CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) -
CertList->SignatureHeaderSize) / CertList->SignatureSize;
- DEBUG ((DEBUG_ERROR, " CertCount = %x\n", CertCount));
+ DEBUG ((DEBUG_INFO, " CertCount = %x\n", CertCount));
if (CertCount != 0) {
CopyMem (OldData + Offset, (UINT8*)(CertList),
CertList->SignatureListSize);
Offset += CertList->SignatureListSize;
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
