[PATCH] SecurityPkg: Tcg2Dxe: Measure BootOrder, Boot#### to PCR[1]

[PATCH] SecurityPkg: Tcg2Dxe: Measure BootOrder, Boot#### to PCR[1]

[Zhang, Chao B]

Measure BootOrder, Boot#### to PCR[1] according to TCG PC-Client PFP Spec
00.21 Section 2.4.4.2
http://www.trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific_Platform_Profile_for_TPM_2p0_Systems_v21.pdf

Cc: Star Zeng <star.zeng@intel.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 79d614c..1d2ac9a 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1982,7 +1982,8 @@ ReadAndMeasureVariable (
 }
 
 /**
-  Read then Measure and log an EFI boot variable, and extend the measurement result into PCR[5].
+  Read then Measure and log an EFI boot variable, and extend the measurement result into PCR[1].
+according to TCG PC Client PFP spec 0021 Section 2.4.4.2
 
   @param[in]   VarName          A Null-terminated string that is the name of the vendor's variable.
   @param[in]   VendorGuid       A unique identifier for the vendor.
@@ -2003,7 +2004,7 @@ ReadAndMeasureBootVariable (
   )
 {
   return ReadAndMeasureVariable (
-           5,
+           1,
            EV_EFI_VARIABLE_BOOT,
            VarName,
            VendorGuid,
-- 
1.9.5.msysgit.1

Re: [PATCH] SecurityPkg: Tcg2Dxe: Measure BootOrder, Boot#### to PCR[1]

[Yao, Jiewen]

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Zhang, Chao B
> Sent: Friday, March 3, 2017 4:36 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH] SecurityPkg: Tcg2Dxe: Measure BootOrder, Boot#### to PCR[1]
> 
> Measure BootOrder, Boot#### to PCR[1] according to TCG PC-Client PFP Spec
> 00.21 Section 2.4.4.2
> http://www.trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific
> _Platform_Profile_for_TPM_2p0_Systems_v21.pdf
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index 79d614c..1d2ac9a 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -1982,7 +1982,8 @@ ReadAndMeasureVariable (
>  }
> 
>  /**
> -  Read then Measure and log an EFI boot variable, and extend the
> measurement result into PCR[5].
> +  Read then Measure and log an EFI boot variable, and extend the
> measurement result into PCR[1].
> +according to TCG PC Client PFP spec 0021 Section 2.4.4.2
> 
>    @param[in]   VarName          A Null-terminated string that is the name
> of the vendor's variable.
>    @param[in]   VendorGuid       A unique identifier for the vendor.
> @@ -2003,7 +2004,7 @@ ReadAndMeasureBootVariable (
>    )
>  {
>    return ReadAndMeasureVariable (
> -           5,
> +           1,
>             EV_EFI_VARIABLE_BOOT,
>             VarName,
>             VendorGuid,
> --
> 1.9.5.msysgit.1