回复: [edk2-devel] [PATCH] MdeModulePkg/Library: change TpmMeasurementLibNull to BASE library.


gaoliming
 

Qi:
This is a bug fix. Do you request to catch it into this stable tag 202008?

Thanks
Liming
-----邮件原件-----
发件人: bounce+27952+64729+4905953+8761045@groups.io
<bounce+27952+64729+4905953+8761045@groups.io> 代表 Yao, Jiewen
发送时间: 2020年8月28日 14:17
收件人: Zhang, Qi1 <qi1.zhang@...>; devel@edk2.groups.io
抄送: Wang, Jian J <jian.j.wang@...>; Wu, Hao A
<hao.a.wu@...>
主题: Re: [edk2-devel] [PATCH] MdeModulePkg/Library: change
TpmMeasurementLibNull to BASE library.

Reviewed-by: Jiewen Yao <Jiewen.yao@...>

-----Original Message-----
From: Zhang, Qi1 <qi1.zhang@...>
Sent: Friday, August 28, 2020 2:15 PM
To: devel@edk2.groups.io
Cc: Zhang, Qi1 <qi1.zhang@...>; Wang, Jian J
<jian.j.wang@...>;
Wu, Hao A <hao.a.wu@...>; Yao, Jiewen <jiewen.yao@...>
Subject: [PATCH] MdeModulePkg/Library: change TpmMeasurementLibNull
to
BASE library.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2940

TpmMeasurementLib includes DxeTpmMeasurementLib and
PeiTpmMeasurementLib.
So need to change TpmMeasurementLibNull to BASE library to avoid build
error in some platform.

Signed-off-by: Qi Zhang <qi1.zhang@...>
Cc: Jian J Wang <jian.j.wang@...>
Cc: Hao A Wu <hao.a.wu@...>
Cc: Jiewen Yao <jiewen.yao@...>
---
.../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c | 4
+++-
.../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf | 6
+++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git
a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.c
b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.c
index b9c5b68de8..ee3be62fc6 100644
---
a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.c
+++
b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.c
@@ -1,11 +1,13 @@
/** @file

This library is used by other modules to measure data to TPM.



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

+Copyright (c) 2015-2020, Intel Corporation. All rights reserved. <BR>

SPDX-License-Identifier: BSD-2-Clause-Patent



**/



+#include <Uefi/UefiBaseType.h>

+

/**

Tpm measure and log data, and extend the measurement result into a
specific
PCR.



diff --git
a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.in
f
b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.in
f
index 61abcfa2ec..1db2c0d6a7 100644
---
a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.in
f
+++
b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu
ll.in
f
@@ -1,7 +1,7 @@
## @file

# Provides NULL TPM measurement function.

#

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

+# Copyright (c) 2015 - 2020, Intel Corporation. All rights
reserved.<BR>

# SPDX-License-Identifier: BSD-2-Clause-Patent

#

##

@@ -10,9 +10,9 @@
INF_VERSION = 0x00010005

BASE_NAME = TpmMeasurementLibNull

FILE_GUID =
6DFD6E9F-9278-48D8-8F45-B6CFF2C2B69C

- MODULE_TYPE = UEFI_DRIVER

+ MODULE_TYPE = BASE

VERSION_STRING = 1.0

- LIBRARY_CLASS =
TpmMeasurementLib|DXE_DRIVER
DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION
UEFI_DRIVER

+ LIBRARY_CLASS = TpmMeasurementLib

MODULE_UNI_FILE = TpmMeasurementLibNull.uni



#

--
2.26.2.windows.1

Join devel@edk2.groups.io to automatically receive all group messages.