Add PI1.2.1 SAP2 support and UEFI231B mantis 896

1. Update SecurityManagementLib to support SAP2 and SAP services. 
2. Update SecurityStub driver to produce SAP2 and SAP protocol both.
3. Update DxeCore and SmmCore to use SAP2 and SAP service to verify Image.
4. Update DxeCore ConnectController() to use SAP2 service to check user permission. 

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Guo Dong <dong.guo@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk@13660 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 91 insertions, 8 deletions

diff --git a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index 8e81d87f9..f2ed384c9 100644
--- a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
@@ -1,7 +1,7 @@
 /** @file

-  This driver produces security architectural protocol based on SecurityManagementLib.

+  This driver produces Security2 and Security architectural protocol based on SecurityManagementLib.

  

-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, 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        

@@ -15,6 +15,7 @@
 

 #include <Uefi.h>

 #include <Protocol/Security.h>

+#include <Protocol/Security2.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiDriverEntryPoint.h>

@@ -68,18 +69,95 @@ SecurityStubAuthenticateState (
   IN CONST EFI_DEVICE_PATH_PROTOCOL    *File

   )

 {

-  return ExecuteSecurityHandlers (AuthenticationStatus, File);

+  return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE, 

+                                   AuthenticationStatus, 

+                                   File,

+                                   NULL, 

+                                   0, 

+                                   FALSE

+                                   );

+}

+

+/**

+  The DXE Foundation uses this service to measure and/or verify a UEFI image.

+

+  This service abstracts the invocation of Trusted Computing Group (TCG) measured boot, UEFI

+  Secure boot, and UEFI User Identity infrastructure. For the former two, the DXE Foundation

+  invokes the FileAuthentication() with a DevicePath and corresponding image in

+  FileBuffer memory. The TCG measurement code will record the FileBuffer contents into the

+  appropriate PCR. The image verification logic will confirm the integrity and provenance of the

+  image in FileBuffer of length FileSize . The origin of the image will be DevicePath in

+  these cases.

+  If the FileBuffer is NULL, the interface will determine if the DevicePath can be connected

+  in order to support the User Identification policy.

+  

+  @param  This             The EFI_SECURITY2_ARCH_PROTOCOL instance.

+  @param  File             A pointer to the device path of the file that is

+                           being dispatched. This will optionally be used for logging.

+  @param  FileBuffer       A pointer to the buffer with the UEFI file image.

+  @param  FileSize         The size of the file.

+  @param  BootPolicy       A boot policy that was used to call LoadImage() UEFI service. If

+                           FileAuthentication() is invoked not from the LoadImage(),

+                           BootPolicy must be set to FALSE.

+  

+  @retval EFI_SUCCESS             The file specified by DevicePath and non-NULL

+                                  FileBuffer did authenticate, and the platform policy dictates

+                                  that the DXE Foundation may use the file.

+  @retval EFI_SUCCESS             The device path specified by NULL device path DevicePath

+                                  and non-NULL FileBuffer did authenticate, and the platform

+                                  policy dictates that the DXE Foundation may execute the image in

+                                  FileBuffer.

+  @retval EFI_SUCCESS             FileBuffer is NULL and current user has permission to start

+                                  UEFI device drivers on the device path specified by DevicePath.

+  @retval EFI_SECURITY_VIOLATION  The file specified by DevicePath and FileBuffer did not

+                                  authenticate, and the platform policy dictates that the file should be

+                                  placed in the untrusted state. The image has been added to the file

+                                  execution table.

+  @retval EFI_ACCESS_DENIED       The file specified by File and FileBuffer did not

+                                  authenticate, and the platform policy dictates that the DXE

+                                  Foundation many not use File.

+  @retval EFI_SECURITY_VIOLATION  FileBuffer is NULL and the user has no

+                                  permission to start UEFI device drivers on the device path specified

+                                  by DevicePath.

+  @retval EFI_SECURITY_VIOLATION  FileBuffer is not NULL and the user has no permission to load

+                                  drivers from the device path specified by DevicePath. The

+                                  image has been added into the list of the deferred images.

+**/

+EFI_STATUS

+EFIAPI

+Security2StubAuthenticate (

+  IN CONST EFI_SECURITY2_ARCH_PROTOCOL *This,

+  IN CONST EFI_DEVICE_PATH_PROTOCOL    *File,

+  IN VOID                              *FileBuffer,

+  IN UINTN                             FileSize,

+  IN BOOLEAN                           BootPolicy

+  )

+{

+  return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_VERIFY_IMAGE | 

+                                   EFI_AUTH_OPERATION_DEFER_IMAGE_LOAD | 

+                                   EFI_AUTH_OPERATION_MEASURE_IMAGE |

+                                   EFI_AUTH_OPERATION_CONNECT_POLICY, 

+                                   0, 

+                                   File,

+                                   FileBuffer, 

+                                   FileSize, 

+                                   BootPolicy

+                                   );

 }

 

 //

-// Security Architectural Protocol instance produced by this driver

+// Security2 and Security Architectural Protocol instance produced by this driver

 //

 EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = { 

   SecurityStubAuthenticateState 

 };

 

+EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = { 

+  Security2StubAuthenticate 

+};

+

 /**

-  Installs Security Architectural Protocol.

+  Installs Security2 and Security Architectural Protocol.

 

   @param  ImageHandle  The image handle of this driver.

   @param  SystemTable  A pointer to the EFI System Table.

@@ -99,6 +177,7 @@ SecurityStubInitialize (
   //

   // Make sure the Security Architectural Protocol is not already installed in the system

   //

+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiSecurity2ArchProtocolGuid);

   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiSecurityArchProtocolGuid);

 

   //

@@ -106,6 +185,8 @@ SecurityStubInitialize (
   //

   Status = gBS->InstallMultipleProtocolInterfaces (

                   &mSecurityArchProtocolHandle,

+                  &gEfiSecurity2ArchProtocolGuid,

+                  &mSecurity2Stub,

                   &gEfiSecurityArchProtocolGuid,

                   &mSecurityStub,

                   NULL

diff --git a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
index 9f580078f..15ebbb865 100644
--- a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+++ b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
@@ -1,7 +1,8 @@
 ## @file

-#  This driver produces security architectural protocol based on SecurityManagementLib.

+#  This driver produces security2 and security architectural protocol 

+#  based on SecurityManagementLib.

 #

-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2006 - 2012, 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

@@ -40,7 +41,8 @@
   SecurityManagementLib

 

 [Protocols]

-  gEfiSecurityArchProtocolGuid                  ## PRODUCED

+  gEfiSecurityArchProtocolGuid                  ## PRODUCES

+  gEfiSecurity2ArchProtocolGuid                 ## PRODUCES

 

 [Depex]

   TRUE