[edk2-devel] [PATCH 0/3] DxeTpm and DxeTpm2MeasureBootLib symbol rename

Doug Flick via groups.io posted 3 patches 1 month, 1 week ago
Failed in applying to current master (apply log)
.../DxeTpm2MeasureBootLibSanitization.h       |  8 +++---
.../DxeTpmMeasureBootLibSanitization.h        |  8 +++---
.../DxeTpm2MeasureBootLib.c                   |  8 +++---
.../DxeTpm2MeasureBootLibSanitization.c       |  8 +++---
.../DxeTpm2MeasureBootLibSanitizationTest.c   | 26 ++++++++---------
.../DxeTpmMeasureBootLib.c                    |  8 +++---
.../DxeTpmMeasureBootLibSanitization.c        | 10 +++----
.../DxeTpmMeasureBootLibSanitizationTest.c    | 26 ++++++++---------
SecurityPkg/SecurityFixes.yaml                | 28 +++++++++++--------
9 files changed, 68 insertions(+), 62 deletions(-)
[edk2-devel] [PATCH 0/3] DxeTpm and DxeTpm2MeasureBootLib symbol rename
Posted by Doug Flick via groups.io 1 month, 1 week ago
OVMF is failing because it includes both DxeTpm2MeasureBootLib and
DxeTpm2MeasureBootLib which makes the symbols collide. This patch
renames the function names to be unique to avoid symbol collision.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>

Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>

Douglas Flick [MSFT] (3):
  SecurityPkg: DxeTpm2MeasureBootLib: SECURITY PATCH 4117/4118 symbol
    rename
  SecurityPkg: DxeTpmMeasureBootLib: SECURITY PATCH 4117/4118 symbol
    rename
  SecurityPkg: : Updating SecurityFixes.yaml after symbol rename

 .../DxeTpm2MeasureBootLibSanitization.h       |  8 +++---
 .../DxeTpmMeasureBootLibSanitization.h        |  8 +++---
 .../DxeTpm2MeasureBootLib.c                   |  8 +++---
 .../DxeTpm2MeasureBootLibSanitization.c       |  8 +++---
 .../DxeTpm2MeasureBootLibSanitizationTest.c   | 26 ++++++++---------
 .../DxeTpmMeasureBootLib.c                    |  8 +++---
 .../DxeTpmMeasureBootLibSanitization.c        | 10 +++----
 .../DxeTpmMeasureBootLibSanitizationTest.c    | 26 ++++++++---------
 SecurityPkg/SecurityFixes.yaml                | 28 +++++++++++--------
 9 files changed, 68 insertions(+), 62 deletions(-)

-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113966): https://edk2.groups.io/g/devel/message/113966
Mute This Topic: https://groups.io/mt/103797461/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 0/3] DxeTpm and DxeTpm2MeasureBootLib symbol rename
Posted by Laszlo Ersek 1 month, 1 week ago
On 1/17/24 23:47, Doug Flick via groups.io wrote:
> OVMF is failing because it includes both DxeTpm2MeasureBootLib and
> DxeTpm2MeasureBootLib which makes the symbols collide. This patch
> renames the function names to be unique to avoid symbol collision.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> 
> Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
> 
> Douglas Flick [MSFT] (3):
>   SecurityPkg: DxeTpm2MeasureBootLib: SECURITY PATCH 4117/4118 symbol
>     rename
>   SecurityPkg: DxeTpmMeasureBootLib: SECURITY PATCH 4117/4118 symbol
>     rename
>   SecurityPkg: : Updating SecurityFixes.yaml after symbol rename
> 
>  .../DxeTpm2MeasureBootLibSanitization.h       |  8 +++---
>  .../DxeTpmMeasureBootLibSanitization.h        |  8 +++---
>  .../DxeTpm2MeasureBootLib.c                   |  8 +++---
>  .../DxeTpm2MeasureBootLibSanitization.c       |  8 +++---
>  .../DxeTpm2MeasureBootLibSanitizationTest.c   | 26 ++++++++---------
>  .../DxeTpmMeasureBootLib.c                    |  8 +++---
>  .../DxeTpmMeasureBootLibSanitization.c        | 10 +++----
>  .../DxeTpmMeasureBootLibSanitizationTest.c    | 26 ++++++++---------
>  SecurityPkg/SecurityFixes.yaml                | 28 +++++++++++--------
>  9 files changed, 68 insertions(+), 62 deletions(-)
> 

Merged as commit range b481b00f593e..264636d8e698, via
<https://github.com/tianocore/edk2/pull/5273>.

Best regards,
Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114011): https://edk2.groups.io/g/devel/message/114011
Mute This Topic: https://groups.io/mt/103797461/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 0/3] DxeTpm and DxeTpm2MeasureBootLib symbol rename
Posted by Yao, Jiewen 1 month, 1 week ago
Thank you Doug for the prompt response.

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

> -----Original Message-----
> From: Douglas Flick [MSFT] <doug.edk2@gmail.com>
> Sent: Thursday, January 18, 2024 6:47 AM
> To: devel@edk2.groups.io
> Cc: Douglas Flick [MSFT] <doug.edk2@gmail.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Kumar, Rahul R <rahul.r.kumar@intel.com>
> Subject: [PATCH 0/3] DxeTpm and DxeTpm2MeasureBootLib symbol rename
> 
> OVMF is failing because it includes both DxeTpm2MeasureBootLib and
> DxeTpm2MeasureBootLib which makes the symbols collide. This patch
> renames the function names to be unique to avoid symbol collision.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> 
> Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
> 
> Douglas Flick [MSFT] (3):
>   SecurityPkg: DxeTpm2MeasureBootLib: SECURITY PATCH 4117/4118 symbol
>     rename
>   SecurityPkg: DxeTpmMeasureBootLib: SECURITY PATCH 4117/4118 symbol
>     rename
>   SecurityPkg: : Updating SecurityFixes.yaml after symbol rename
> 
>  .../DxeTpm2MeasureBootLibSanitization.h       |  8 +++---
>  .../DxeTpmMeasureBootLibSanitization.h        |  8 +++---
>  .../DxeTpm2MeasureBootLib.c                   |  8 +++---
>  .../DxeTpm2MeasureBootLibSanitization.c       |  8 +++---
>  .../DxeTpm2MeasureBootLibSanitizationTest.c   | 26 ++++++++---------
>  .../DxeTpmMeasureBootLib.c                    |  8 +++---
>  .../DxeTpmMeasureBootLibSanitization.c        | 10 +++----
>  .../DxeTpmMeasureBootLibSanitizationTest.c    | 26 ++++++++---------
>  SecurityPkg/SecurityFixes.yaml                | 28 +++++++++++--------
>  9 files changed, 68 insertions(+), 62 deletions(-)
> 
> --
> 2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113980): https://edk2.groups.io/g/devel/message/113980
Mute This Topic: https://groups.io/mt/103797461/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-