1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH v2 00/17] Remove duplicated words
  4. View patch

[edk2-devel] [PATCH v2 12/17] SecurityPkg: Remove duplicated words

PierreGondois posted 17 patches 3 years, 5 months ago
[edk2-devel] [PATCH v2 12/17] SecurityPkg: Remove duplicated words
Posted by PierreGondois 3 years, 5 months ago 
From: Pierre Gondois <pierre.gondois@arm.com>

In an effort to clean the documentation of the above
package, remove duplicated words.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 SecurityPkg/Include/Library/Tpm2CommandLib.h                  | 2 +-
 .../Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni     | 4 ++--
 .../Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni     | 4 ++--
 .../SecureBootVariableProvisionLib.c                          | 2 +-
 SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c            | 2 +-
 SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c                           | 2 +-
 SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c                   | 2 +-
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c                               | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/SecurityPkg/Include/Library/Tpm2CommandLib.h b/SecurityPkg/Include/Library/Tpm2CommandLib.h
index a2fb97f18dfe..1912f54c8416 100644
--- a/SecurityPkg/Include/Library/Tpm2CommandLib.h
+++ b/SecurityPkg/Include/Library/Tpm2CommandLib.h
@@ -136,7 +136,7 @@ Tpm2SelfTest (
 
 /**
   This command allows setting of the authorization policy for the platform hierarchy (platformPolicy), the
-  storage hierarchy (ownerPolicy), and and the endorsement hierarchy (endorsementPolicy).
+  storage hierarchy (ownerPolicy), and the endorsement hierarchy (endorsementPolicy).
 
   @param[in]  AuthHandle            TPM_RH_ENDORSEMENT, TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated
   @param[in]  AuthSession           Auth Session context
diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
index a1139810b1cb..ab043e8f5a1c 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
@@ -1,7 +1,7 @@
 // /** @file
 // Provides TPM measurement functions for TPM1.2 and TPM 2.0
 //
-// This library provides TpmMeasureAndLogData() to to measure and log data, and
+// This library provides TpmMeasureAndLogData() to measure and log data, and
 // extend the measurement result into a specific PCR.
 //
 // Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
@@ -13,5 +13,5 @@
 
 #string STR_MODULE_ABSTRACT             #language en-US "Provides TPM measurement functions for TPM1.2 and TPM 2.0"
 
-#string STR_MODULE_DESCRIPTION          #language en-US "This library provides TpmMeasureAndLogData() to to measure and log data, and extend the measurement result into a specific PCR."
+#string STR_MODULE_DESCRIPTION          #language en-US "This library provides TpmMeasureAndLogData() to measure and log data, and extend the measurement result into a specific PCR."
 
diff --git a/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni b/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni
index 7b4341b449f4..4d0159d18ce3 100644
--- a/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni
+++ b/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni
@@ -1,7 +1,7 @@
 // /** @file
 // Provides TPM measurement functions for TPM1.2 and TPM 2.0
 //
-// This library provides TpmMeasureAndLogData() to to measure and log data, and
+// This library provides TpmMeasureAndLogData() to measure and log data, and
 // extend the measurement result into a specific PCR.
 //
 // Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
@@ -13,5 +13,5 @@
 
 #string STR_MODULE_ABSTRACT             #language en-US "Provides TPM measurement functions for TPM1.2 and TPM 2.0"
 
-#string STR_MODULE_DESCRIPTION          #language en-US "This library provides TpmMeasureAndLogData() to to measure and log data, and extend the measurement result into a specific PCR."
+#string STR_MODULE_DESCRIPTION          #language en-US "This library provides TpmMeasureAndLogData() to measure and log data, and extend the measurement result into a specific PCR."
 
diff --git a/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c b/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c
index bed1fe86205d..9e7b8946274d 100644
--- a/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c
+++ b/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c
@@ -28,7 +28,7 @@
   Create a EFI Signature List with data fetched from section specified as a argument.
   Found keys are verified using RsaGetPublicKeyFromX509().
 
-  @param[in]        KeyFileGuid    A pointer to to the FFS filename GUID
+  @param[in]        KeyFileGuid    A pointer to the FFS filename GUID
   @param[out]       SigListsSize   A pointer to size of signature list
   @param[out]       SigListOut    a pointer to a callee-allocated buffer with signature lists
 
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
index 7144955be1a5..8e518317aa19 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
@@ -116,7 +116,7 @@ typedef struct {
 
 /**
   This command allows setting of the authorization policy for the platform hierarchy (platformPolicy), the
-  storage hierarchy (ownerPolicy), and and the endorsement hierarchy (endorsementPolicy).
+  storage hierarchy (ownerPolicy), and the endorsement hierarchy (endorsementPolicy).
 
   @param[in]  AuthHandle            TPM_RH_ENDORSEMENT, TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated
   @param[in]  AuthSession           Auth Session context
diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
index e8822cbeb015..36243321a6cc 100644
--- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
+++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
@@ -97,7 +97,7 @@ EFI_TPM2_ACPI_TABLE_V4  mTpm2AcpiTemplate = {
     EFI_TPM2_ACPI_TABLE_REVISION,
     //
     // Compiler initializes the remaining bytes to 0
-    // These fields should be filled in in production
+    // These fields should be filled in production
     //
   },
   0, // BIT0~15:  PlatformClass
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
index 6eb04c014448..e7b74e8d399d 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
@@ -278,7 +278,7 @@ SaveTcg2PpRequestParameter (
 }
 
 /**
-  Save Tcg2 PCR Banks request request to variable space.
+  Save Tcg2 PCR Banks request to variable space.
 
   @param[in] PCRBankIndex     PCR Bank Index.
   @param[in] Enable           Enable or disable this PCR Bank.
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index ee6c6273033b..8b596a99262e 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -67,7 +67,7 @@ EFI_TCG_CLIENT_ACPI_TABLE  mTcgClientAcpiTemplate = {
     0x02                      // Revision
     //
     // Compiler initializes the remaining bytes to 0
-    // These fields should be filled in in production
+    // These fields should be filled in production
     //
   },
   0,                                   // 0 for PC Client Platform Class
@@ -88,7 +88,7 @@ EFI_TCG_SERVER_ACPI_TABLE  mTcgServerAcpiTemplate = {
     0x02                      // Revision
     //
     // Compiler initializes the remaining bytes to 0
-    // These fields should be filled in in production
+    // These fields should be filled in production
     //
   },
   1,                                    // 1 for Server Platform Class
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93203): https://edk2.groups.io/g/devel/message/93203
Mute This Topic: https://groups.io/mt/93496610/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 12/17] SecurityPkg: Remove duplicated words
Posted by Yao, Jiewen 3 years, 5 months ago 
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
> Sent: Tuesday, September 6, 2022 4:29 PM
> To: devel@edk2.groups.io
> Cc: Pierre Gondois <pierre.gondois@arm.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>
> Subject: [PATCH v2 12/17] SecurityPkg: Remove duplicated words
> 
> From: Pierre Gondois <pierre.gondois@arm.com>
> 
> In an effort to clean the documentation of the above
> package, remove duplicated words.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
> ---
>  SecurityPkg/Include/Library/Tpm2CommandLib.h                  | 2 +-
>  .../Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni     | 4 ++-
> -
>  .../Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.uni     | 4 ++--
>  .../SecureBootVariableProvisionLib.c                          | 2 +-
>  SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c            | 2 +-
>  SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c                           | 2 +-
>  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c                   | 2 +-
>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                               | 4 ++--
>  8 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/SecurityPkg/Include/Library/Tpm2CommandLib.h
> b/SecurityPkg/Include/Library/Tpm2CommandLib.h
> index a2fb97f18dfe..1912f54c8416 100644
> --- a/SecurityPkg/Include/Library/Tpm2CommandLib.h
> +++ b/SecurityPkg/Include/Library/Tpm2CommandLib.h
> @@ -136,7 +136,7 @@ Tpm2SelfTest (
> 
>  /**
>    This command allows setting of the authorization policy for the platform
> hierarchy (platformPolicy), the
> -  storage hierarchy (ownerPolicy), and and the endorsement hierarchy
> (endorsementPolicy).
> +  storage hierarchy (ownerPolicy), and the endorsement hierarchy
> (endorsementPolicy).
> 
>    @param[in]  AuthHandle            TPM_RH_ENDORSEMENT,
> TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated
>    @param[in]  AuthSession           Auth Session context
> diff --git
> a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.u
> ni
> b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.u
> ni
> index a1139810b1cb..ab043e8f5a1c 100644
> ---
> a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.u
> ni
> +++
> b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.u
> ni
> @@ -1,7 +1,7 @@
>  // /** @file
>  // Provides TPM measurement functions for TPM1.2 and TPM 2.0
>  //
> -// This library provides TpmMeasureAndLogData() to to measure and log
> data, and
> +// This library provides TpmMeasureAndLogData() to measure and log
> data, and
>  // extend the measurement result into a specific PCR.
>  //
>  // Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
> @@ -13,5 +13,5 @@
> 
>  #string STR_MODULE_ABSTRACT             #language en-US "Provides TPM
> measurement functions for TPM1.2 and TPM 2.0"
> 
> -#string STR_MODULE_DESCRIPTION          #language en-US "This library
> provides TpmMeasureAndLogData() to to measure and log data, and extend
> the measurement result into a specific PCR."
> +#string STR_MODULE_DESCRIPTION          #language en-US "This library
> provides TpmMeasureAndLogData() to measure and log data, and extend
> the measurement result into a specific PCR."
> 
> diff --git
> a/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.un
> i
> b/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.un
> i
> index 7b4341b449f4..4d0159d18ce3 100644
> ---
> a/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.un
> i
> +++
> b/SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasurementLib.un
> i
> @@ -1,7 +1,7 @@
>  // /** @file
>  // Provides TPM measurement functions for TPM1.2 and TPM 2.0
>  //
> -// This library provides TpmMeasureAndLogData() to to measure and log
> data, and
> +// This library provides TpmMeasureAndLogData() to measure and log
> data, and
>  // extend the measurement result into a specific PCR.
>  //
>  // Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
> @@ -13,5 +13,5 @@
> 
>  #string STR_MODULE_ABSTRACT             #language en-US "Provides TPM
> measurement functions for TPM1.2 and TPM 2.0"
> 
> -#string STR_MODULE_DESCRIPTION          #language en-US "This library
> provides TpmMeasureAndLogData() to to measure and log data, and extend
> the measurement result into a specific PCR."
> +#string STR_MODULE_DESCRIPTION          #language en-US "This library
> provides TpmMeasureAndLogData() to measure and log data, and extend
> the measurement result into a specific PCR."
> 
> diff --git
> a/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariable
> ProvisionLib.c
> b/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariable
> ProvisionLib.c
> index bed1fe86205d..9e7b8946274d 100644
> ---
> a/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariable
> ProvisionLib.c
> +++
> b/SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariable
> ProvisionLib.c
> @@ -28,7 +28,7 @@
>    Create a EFI Signature List with data fetched from section specified as a
> argument.
>    Found keys are verified using RsaGetPublicKeyFromX509().
> 
> -  @param[in]        KeyFileGuid    A pointer to to the FFS filename GUID
> +  @param[in]        KeyFileGuid    A pointer to the FFS filename GUID
>    @param[out]       SigListsSize   A pointer to size of signature list
>    @param[out]       SigListOut    a pointer to a callee-allocated buffer with
> signature lists
> 
> diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
> b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
> index 7144955be1a5..8e518317aa19 100644
> --- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
> +++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
> @@ -116,7 +116,7 @@ typedef struct {
> 
>  /**
>    This command allows setting of the authorization policy for the platform
> hierarchy (platformPolicy), the
> -  storage hierarchy (ownerPolicy), and and the endorsement hierarchy
> (endorsementPolicy).
> +  storage hierarchy (ownerPolicy), and the endorsement hierarchy
> (endorsementPolicy).
> 
>    @param[in]  AuthHandle            TPM_RH_ENDORSEMENT,
> TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated
>    @param[in]  AuthSession           Auth Session context
> diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
> b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
> index e8822cbeb015..36243321a6cc 100644
> --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
> +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
> @@ -97,7 +97,7 @@ EFI_TPM2_ACPI_TABLE_V4  mTpm2AcpiTemplate = {
>      EFI_TPM2_ACPI_TABLE_REVISION,
>      //
>      // Compiler initializes the remaining bytes to 0
> -    // These fields should be filled in in production
> +    // These fields should be filled in production
>      //
>    },
>    0, // BIT0~15:  PlatformClass
> diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
> b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
> index 6eb04c014448..e7b74e8d399d 100644
> --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
> +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
> @@ -278,7 +278,7 @@ SaveTcg2PpRequestParameter (
>  }
> 
>  /**
> -  Save Tcg2 PCR Banks request request to variable space.
> +  Save Tcg2 PCR Banks request to variable space.
> 
>    @param[in] PCRBankIndex     PCR Bank Index.
>    @param[in] Enable           Enable or disable this PCR Bank.
> diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> index ee6c6273033b..8b596a99262e 100644
> --- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> +++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
> @@ -67,7 +67,7 @@ EFI_TCG_CLIENT_ACPI_TABLE
> mTcgClientAcpiTemplate = {
>      0x02                      // Revision
>      //
>      // Compiler initializes the remaining bytes to 0
> -    // These fields should be filled in in production
> +    // These fields should be filled in production
>      //
>    },
>    0,                                   // 0 for PC Client Platform Class
> @@ -88,7 +88,7 @@ EFI_TCG_SERVER_ACPI_TABLE
> mTcgServerAcpiTemplate = {
>      0x02                      // Revision
>      //
>      // Compiler initializes the remaining bytes to 0
> -    // These fields should be filled in in production
> +    // These fields should be filled in production
>      //
>    },
>    1,                                    // 1 for Server Platform Class
> --
> 2.25.1



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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.