sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch of PI tree to main trunk

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3918 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2
2007-09-24 11:38:43 +00:00
parent f6203b7192
commit b0d803fe3e
34 changed files with 2893 additions and 1393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MdeModulePkg/Core/Pei/Security/Security.c
View File

@@ -32,7 +32,7 @@ SecurityPpiNotifyCallback (
static EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
&gEfiPeiSecurityPpiGuid,
&gEfiPeiSecurity2PpiGuid,
SecurityPpiNotifyCallback
};
@@ -101,15 +101,16 @@ Returns:
// If there isn't a security PPI installed, use the one from notification
//
if (PrivateData->PrivateSecurityPpi == NULL) {
PrivateData->PrivateSecurityPpi = (EFI_PEI_SECURITY_PPI *)Ppi;
PrivateData->PrivateSecurityPpi = (EFI_PEI_SECURITY2_PPI *)Ppi;
}
return EFI_SUCCESS;
}
EFI_STATUS
VerifyPeim (
IN EFI_PEI_SERVICES **PeiServices,
IN EFI_FFS_FILE_HEADER *CurrentPeimAddress
IN PEI_CORE_INSTANCE *PrivateData,
IN EFI_PEI_FV_HANDLE VolumeHandle,
IN EFI_PEI_FILE_HANDLE FileHandle
)
/*++
@@ -129,21 +130,15 @@ Returns:
--*/
{
PEI_CORE_INSTANCE *PrivateData;
EFI_STATUS Status;
UINT32 AuthenticationStatus;
BOOLEAN StartCrisisRecovery;
BOOLEAN DeferExection;
//
// Set a default authentication state
//
AuthenticationStatus = 0;
//
// get security PPI instance from PEI private data
//
PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);
if (PrivateData->PrivateSecurityPpi == NULL) {
Status = EFI_NOT_FOUND;
} else {
@@ -151,13 +146,14 @@ Returns:
// Check to see if the image is OK
//
Status = PrivateData->PrivateSecurityPpi->AuthenticationState (
PeiServices,
(CONST EFI_PEI_SERVICES **) &PrivateData->PS,
PrivateData->PrivateSecurityPpi,
AuthenticationStatus,
CurrentPeimAddress,
&StartCrisisRecovery
VolumeHandle,
FileHandle,
&DeferExection
);
if (StartCrisisRecovery) {
if (DeferExection) {
Status = EFI_SECURITY_VIOLATION;
}
}