Revision: 14118
http://edk2.svn.sourceforge.net/edk2/?rev=14118&view=rev
Author: lgao4
Date: 2013-02-01 05:34:19 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Update SecurityStub SAP protocol to support SecureHandler and SecureHandler2
both.
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>
Reviewed-by: Star Zeng <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
trunk/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
Modified:
trunk/edk2/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
===================================================================
---
trunk/edk2/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
2013-02-01 04:50:28 UTC (rev 14117)
+++
trunk/edk2/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
2013-02-01 05:34:19 UTC (rev 14118)
@@ -1,7 +1,7 @@
/** @file
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
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
@@ -102,7 +102,7 @@
//
// 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,
Modified: trunk/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
2013-02-01 04:50:28 UTC (rev 14117)
+++ trunk/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
2013-02-01 05:34:19 UTC (rev 14118)
@@ -1,7 +1,7 @@
/** @file
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
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
@@ -69,13 +69,20 @@
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,
File,
NULL,
0,
FALSE
);
+ if (Status == EFI_SUCCESS) {
+ Status = ExecuteSecurityHandlers (AuthenticationStatus, File);
+ }
+
+ return Status;
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
