924da87b5c
Signed-off-by: Jinhua Cao <caojinhua1@huawei.com> Signed-off-by: yezengruan <yezengruan@huawei.com>
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
From edaa95dc147509a6c84225d70476c7dd9179cb57 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
|
Date: Mon, 13 Sep 2021 22:21:00 +0800
|
|
Subject: [PATCH 4/8] SecurityPkg/Tcg: Make Tcg2PlatformDxe buildable and fix
|
|
style issues
|
|
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
|
|
---
|
|
SecurityPkg/Include/Library/TpmPlatformHierarchyLib.h | 4 ++--
|
|
.../PeiDxeTpmPlatformHierarchyLib.c | 2 +-
|
|
SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 3 +--
|
|
3 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/SecurityPkg/Include/Library/TpmPlatformHierarchyLib.h b/SecurityPkg/Include/Library/TpmPlatformHierarchyLib.h
|
|
index a872fa09dc..8d61a4867b 100644
|
|
--- a/SecurityPkg/Include/Library/TpmPlatformHierarchyLib.h
|
|
+++ b/SecurityPkg/Include/Library/TpmPlatformHierarchyLib.h
|
|
@@ -11,8 +11,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
|
**/
|
|
|
|
-#ifndef _TPM_PLATFORM_HIERARCHY_LIB_H_
|
|
-#define _TPM_PLATFORM_HIERARCHY_LIB_H_
|
|
+#ifndef TPM_PLATFORM_HIERARCHY_LIB_H_
|
|
+#define TPM_PLATFORM_HIERARCHY_LIB_H_
|
|
|
|
/**
|
|
This service will perform the TPM Platform Hierarchy configuration at the SmmReadyToLock event.
|
|
diff --git a/SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.c b/SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.c
|
|
index d82a0ae1bd..0bb04a20fc 100644
|
|
--- a/SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.c
|
|
+++ b/SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.c
|
|
@@ -233,7 +233,7 @@ DisableTpmPlatformHierarchy (
|
|
|
|
/**
|
|
This service defines the configuration of the Platform Hierarchy Authorization Value (platformAuth)
|
|
- and Platform Hierarchy Authorization Policy (platformPolicy)
|
|
+ and Platform Hierarchy Authorization Policy (platformPolicy).
|
|
|
|
**/
|
|
VOID
|
|
diff --git a/SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf b/SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
|
|
index af29c1cd98..635302fe6f 100644
|
|
--- a/SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
|
|
+++ b/SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
|
|
@@ -1,4 +1,4 @@
|
|
-### @file
|
|
+## @file
|
|
# Platform specific TPM2 component.
|
|
#
|
|
# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
|
|
@@ -31,7 +31,6 @@
|
|
[Packages]
|
|
MdePkg/MdePkg.dec
|
|
MdeModulePkg/MdeModulePkg.dec
|
|
- MinPlatformPkg/MinPlatformPkg.dec
|
|
SecurityPkg/SecurityPkg.dec
|
|
|
|
[Sources]
|
|
--
|
|
2.27.0
|
|
|