tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SecurityStub SAP protocol to support SecureHandler and SecureHandler2 both. 

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14118 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2013-02-01 05:34:19 +00:00
parent 416211e0d8
commit c9e8881516
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Provides generic security measurement functions for DXE module. Provides generic security measurement functions for DXE module.
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -102,7 +102,7 @@ CheckAuthenticationOperation (
// //
// Make sure new auth operation can be recognized. // Make sure new auth operation can be recognized.
// //
ASSERT ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK | EFI_AUTH_OPERATION_IMAGE_REQUIRED)) == 0); ASSERT ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK | EFI_AUTH_OPERATION_AUTHENTICATION_STATE | EFI_AUTH_OPERATION_IMAGE_REQUIRED)) == 0);
// //
// When current operation includes measure image operation, // When current operation includes measure image operation,

11
MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This driver produces Security2 and Security architectural protocol based on SecurityManagementLib. This driver produces Security2 and Security architectural protocol based on SecurityManagementLib.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -69,13 +69,20 @@ SecurityStubAuthenticateState (
IN CONST EFI_DEVICE_PATH_PROTOCOL *File IN CONST EFI_DEVICE_PATH_PROTOCOL *File
) )
{ {
return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE, EFI_STATUS Status;
Status = ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE,
AuthenticationStatus, AuthenticationStatus,
File, File,
NULL, NULL,
0, 0,
FALSE FALSE
); );
if (Status == EFI_SUCCESS) {
Status = ExecuteSecurityHandlers (AuthenticationStatus, File);
}
return Status;
} }
/** /**