diff options
| author | Eric Dong <eric.dong@intel.com> | 2016-11-23 16:26:36 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2016-11-23 16:30:03 +0800 |
| commit | 252b891b2b49dddad5e3850146719d14c22f1c60 (patch) | |
| tree | 7e430a6a78bcc4284d8e14c2e3379b0350b998a6 /SecurityPkg/Library/DxeTcgPhysicalPresenceLib | |
| parent | 67bb14259baaf2237b81bcbf2568517b3310b294 (diff) | |
| download | edk2-252b891b2b49dddad5e3850146719d14c22f1c60.tar.gz edk2-252b891b2b49dddad5e3850146719d14c22f1c60.tar.bz2 edk2-252b891b2b49dddad5e3850146719d14c22f1c60.zip | |
Revert old "Enable BlockSid related PP actions" patch series.
New solution for this issue will be provided.
This reverts commits from d1947ce509d745f32db6b7fecc03dc9c778b9350
to bda034c34deea6eb43edcef28018a9ace8f04637.
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Diffstat (limited to 'SecurityPkg/Library/DxeTcgPhysicalPresenceLib')
| -rw-r--r-- | SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c | 19 | ||||
| -rw-r--r-- | SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf | 1 |
2 files changed, 2 insertions, 18 deletions
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c index ca8de26b75..4f35be80bb 100644 --- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c +++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c @@ -35,7 +35,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/EventGroup.h>
#include <Guid/PhysicalPresenceData.h>
#include <Library/TcgPpVendorLib.h>
-#include <Library/TcgPhysicalPresenceStorageLib.h>
#define CONFIRM_BUFFER_SIZE 4096
@@ -1173,12 +1172,7 @@ TcgPhysicalPresenceLibProcessRequest ( EFI_TCG_PROTOCOL *TcgProtocol;
EDKII_VARIABLE_LOCK_PROTOCOL *VariableLockProtocol;
EFI_PHYSICAL_PRESENCE_FLAGS PpiFlags;
-
- //
- // Process the storage related action first.
- //
- TcgPhysicalPresenceStorageLibProcessRequest();
-
+
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **)&TcgProtocol);
if (EFI_ERROR (Status)) {
return ;
@@ -1323,16 +1317,7 @@ TcgPhysicalPresenceLibNeedUserConfirm( BOOLEAN CmdEnable;
EFI_TCG_PROTOCOL *TcgProtocol;
EFI_PHYSICAL_PRESENCE_FLAGS PpiFlags;
-
- //
- // Process the storage related action first.
- // If confirm need user confirm, just return TRUE.
- // else continue check other actions.
- //
- if (TcgPhysicalPresenceStorageLibNeedUserConfirm()) {
- return TRUE;
- }
-
+
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **)&TcgProtocol);
if (EFI_ERROR (Status)) {
return FALSE;
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf index 8421dfae4d..3aacba5c2b 100644 --- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf +++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf @@ -55,7 +55,6 @@ PrintLib
HiiLib
TcgPpVendorLib
- TcgPhysicalPresenceStorageLib
[Protocols]
gEfiTcgProtocolGuid ## SOMETIMES_CONSUMES
|