Add debug information for secure boot test convenient.

Signed-off-by: gdong1
Reviewed-by: tye
Reviewed-by: xdu2

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12660 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
gdong1 2011-11-04 05:41:06 +00:00
parent d3945da644
commit 7aaf2fd67c
1 changed files with 16 additions and 7 deletions

View File

@ -91,6 +91,7 @@ AutenticatedVariableServiceInitialize (
{ {
EFI_STATUS Status; EFI_STATUS Status;
VARIABLE_POINTER_TRACK Variable; VARIABLE_POINTER_TRACK Variable;
VARIABLE_POINTER_TRACK PkVariable;
UINT8 VarValue; UINT8 VarValue;
UINT32 VarAttr; UINT32 VarAttr;
UINT8 *Data; UINT8 *Data;
@ -164,6 +165,14 @@ AutenticatedVariableServiceInitialize (
CopyMem (mPubKeyStore, (UINT8 *) Data, DataSize); CopyMem (mPubKeyStore, (UINT8 *) Data, DataSize);
mPubKeyNumber = (UINT32) (DataSize / EFI_CERT_TYPE_RSA2048_SIZE); mPubKeyNumber = (UINT32) (DataSize / EFI_CERT_TYPE_RSA2048_SIZE);
} }
FindVariable (EFI_PLATFORM_KEY_NAME, &gEfiGlobalVariableGuid, &PkVariable, &mVariableModuleGlobal->VariableGlobal);
if (PkVariable.CurrPtr == NULL) {
DEBUG ((EFI_D_INFO, "Variable %s does not exist.\n", EFI_PLATFORM_KEY_NAME));
} else {
DEBUG ((EFI_D_INFO, "Variable %s exists.\n", EFI_PLATFORM_KEY_NAME));
}
// //
// Check "SetupMode" variable's existence. // Check "SetupMode" variable's existence.
// If it doesn't exist, check PK database's existence to determine the value. // If it doesn't exist, check PK database's existence to determine the value.
@ -177,13 +186,7 @@ AutenticatedVariableServiceInitialize (
); );
if (Variable.CurrPtr == NULL) { if (Variable.CurrPtr == NULL) {
Status = FindVariable ( if (PkVariable.CurrPtr == NULL) {
EFI_PLATFORM_KEY_NAME,
&gEfiGlobalVariableGuid,
&Variable,
&mVariableModuleGlobal->VariableGlobal
);
if (Variable.CurrPtr == NULL) {
mPlatformMode = SETUP_MODE; mPlatformMode = SETUP_MODE;
} else { } else {
mPlatformMode = USER_MODE; mPlatformMode = USER_MODE;
@ -284,12 +287,18 @@ AutenticatedVariableServiceInitialize (
return Status; return Status;
} }
DEBUG ((EFI_D_INFO, "Variable %s is %x\n", EFI_SETUP_MODE_NAME, mPlatformMode));
DEBUG ((EFI_D_INFO, "Variable %s is %x\n", EFI_SECURE_BOOT_MODE_NAME, SecureBootMode));
DEBUG ((EFI_D_INFO, "Variable %s is %x\n", EFI_SECURE_BOOT_ENABLE_NAME, SecureBootEnable));
// //
// Detect whether a secure platform-specific method to clear PK(Platform Key) // Detect whether a secure platform-specific method to clear PK(Platform Key)
// is configured by platform owner. This method is provided for users force to clear PK // is configured by platform owner. This method is provided for users force to clear PK
// in case incorrect enrollment mis-haps. // in case incorrect enrollment mis-haps.
// //
if (ForceClearPK ()) { if (ForceClearPK ()) {
DEBUG ((EFI_D_INFO, "Variable PK/KEK/DB/DBX will be cleared in clear PK mode.\n"));
// //
// 1. Clear PK. // 1. Clear PK.
// //