Merge branch of PI tree to main trunk

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Security / Security.c

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