SecurityPkg: Fix spelling errors

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

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/SecurityPkg/FvReportPei/FvReportPei.c b/SecurityPkg/FvReportPei/FvReportPei.c
index d24470af6b19c153dc6264a8305b9d9bdcd30816..d709760ea3ce783465d5f116037406a54714bf68 100644 (file)
--- a/SecurityPkg/FvReportPei/FvReportPei.c
+++ b/SecurityPkg/FvReportPei/FvReportPei.c
@@ -145,7 +145,7 @@ VerifyHashedFv (
   ASSERT (HashValue != NULL);\r
 \r
   //\r
   ASSERT (HashValue != NULL);\r
 \r
   //\r

-  // Calcuate hash value for each FV first.\r
+  // Calculate hash value for each FV first.\r

   //\r
   FvHashValue = HashValue;\r
   for (FvIndex = 0; FvIndex < FvNumber; ++FvIndex) {\r
   //\r
   FvHashValue = HashValue;\r
   for (FvIndex = 0; FvIndex < FvNumber; ++FvIndex) {\r


@@ -281,7 +281,7 @@ ReportHashedFv (
   @param[in] StoredHashFvPpi  Pointer to PPI containing hash information.\r
   @param[in] BootMode         Current boot mode.\r
 \r
   @param[in] StoredHashFvPpi  Pointer to PPI containing hash information.\r
   @param[in] BootMode         Current boot mode.\r
 \r

-  @retval Pointer to structure containning valid hash information for current boot mode.\r
+  @retval Pointer to structure containing valid hash information for current boot mode.\r

   @retval NULL if there's no hash associated with current boot mode.\r
 **/\r
 STATIC\r
   @retval NULL if there's no hash associated with current boot mode.\r
 **/\r
 STATIC\r

diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.c b/SecurityPkg/Hash2DxeCrypto/Driver.c
index 6aa88f8b3b9451c4713762966fd6d440e3a9675d..4627061a28822fd74b68d059d09283f29dc57f3c 100644 (file)
--- a/SecurityPkg/Hash2DxeCrypto/Driver.c
+++ b/SecurityPkg/Hash2DxeCrypto/Driver.c
@@ -22,7 +22,7 @@ EFI_SERVICE_BINDING_PROTOCOL    mHash2ServiceBindingProtocol = {
                                      it is not NULL, then the I/O services are added\r
                                      to the existing child handle.\r
 \r
                                      it is not NULL, then the I/O services are added\r
                                      to the existing child handle.\r
 \r

-  @retval EFI_SUCCES                 The protocol was added to ChildHandle.\r
+  @retval EFI_SUCCESS                The protocol was added to ChildHandle.\r

   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.\r
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to\r
                                      create the child.\r
   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.\r
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to\r
                                      create the child.\r


@@ -99,7 +99,7 @@ Hash2ServiceBindingCreateChild (
                                  instance.\r
   @param[in]  ChildHandle        Handle of the child to destroy.\r
 \r
                                  instance.\r
   @param[in]  ChildHandle        Handle of the child to destroy.\r
 \r

-  @retval EFI_SUCCES             The protocol was removed from ChildHandle.\r
+  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.\r

   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that\r
                                  is being removed.\r
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.\r
   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that\r
                                  is being removed.\r
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.\r


@@ -193,7 +193,7 @@ Hash2ServiceBindingDestroyChild (
   @param[in]  ImageHandle  The image handle of the driver.\r
   @param[in]  SystemTable  The system table.\r
 \r
   @param[in]  ImageHandle  The image handle of the driver.\r
   @param[in]  SystemTable  The system table.\r
 \r

-  @retval EFI_SUCCES       The service binding protocols is successfully installed.\r
+  @retval EFI_SUCCESS      The service binding protocols is successfully installed.\r

   @retval Others           Other errors as indicated.\r
 \r
 **/\r
   @retval Others           Other errors as indicated.\r
 \r
 **/\r

diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.h b/SecurityPkg/Hash2DxeCrypto/Driver.h
index 162279e469288a79cb5350da9726bcb842fbc2ac..7b8996912a08bc37e2e21ffba00b3ebfea187f7c 100644 (file)
--- a/SecurityPkg/Hash2DxeCrypto/Driver.h
+++ b/SecurityPkg/Hash2DxeCrypto/Driver.h
@@ -79,7 +79,7 @@ typedef struct {
                                      it is not NULL, then the I/O services are added\r
                                      to the existing child handle.\r
 \r
                                      it is not NULL, then the I/O services are added\r
                                      to the existing child handle.\r
 \r

-  @retval EFI_SUCCES                 The protocol was added to ChildHandle.\r
+  @retval EFI_SUCCESS                The protocol was added to ChildHandle.\r

   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.\r
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to\r
                                      create the child.\r
   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.\r
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available to\r
                                      create the child.\r


@@ -104,7 +104,7 @@ Hash2ServiceBindingCreateChild (
                                  instance.\r
   @param[in]  ChildHandle        Handle of the child to destroy.\r
 \r
                                  instance.\r
   @param[in]  ChildHandle        Handle of the child to destroy.\r
 \r

-  @retval EFI_SUCCES             The protocol was removed from ChildHandle.\r
+  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.\r

   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that\r
                                  is being removed.\r
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.\r
   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that\r
                                  is being removed.\r
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.\r

diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c b/SecurityPkg/HddPassword/HddPasswordDxe.c
index 051e64091d7f78b7c3487078ef4553aead00f6b8..a25b3471d073449e6bb99d753be80c412c7355b6 100644 (file)
--- a/SecurityPkg/HddPassword/HddPasswordDxe.c
+++ b/SecurityPkg/HddPassword/HddPasswordDxe.c
@@ -120,7 +120,7 @@ BuildHddPasswordDeviceInfo (
 \r
     //\r
     // 1. Handle device which already set password.\r
 \r
     //\r
     // 1. Handle device which already set password.\r

-    // 2. When request to send freeze comamnd, driver also needs to handle device\r
+    // 2. When request to send freeze command, driver also needs to handle device\r

     //    which support security feature.\r
     //\r
     if ((!PasswordIsFullZero (ConfigFormEntry->Password)) ||\r
     //    which support security feature.\r
     //\r
     if ((!PasswordIsFullZero (ConfigFormEntry->Password)) ||\r


@@ -2008,9 +2008,9 @@ SaveHddPasswordRequest (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Get the HDD Password configuration form entry by the index of the goto opcode actived.\r
+  Get the HDD Password configuration form entry by the index of the goto opcode activated.\r

 \r
 \r

-  @param[in]  Index The 0-based index of the goto opcode actived.\r
+  @param[in]  Index The 0-based index of the goto opcode activated.\r

 \r
   @return The HDD Password configuration form entry found.\r
 **/\r
 \r
   @return The HDD Password configuration form entry found.\r
 **/\r


@@ -2758,7 +2758,7 @@ HddPasswordConfigFormInit (
   @param ImageHandle     Image handle this driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r
   @param ImageHandle     Image handle this driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r

-  @retval EFI_SUCESS     This function always complete successfully.\r
+  @retval EFI_SUCCESS     This function always complete successfully.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -2806,7 +2806,7 @@ HddPasswordDxeInit (
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

-  // Make HDD_PASSWORD_VARIABLE_NAME varible read-only.\r
+  // Make HDD_PASSWORD_VARIABLE_NAME variable read-only.\r

   //\r
   Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);\r
   if (!EFI_ERROR (Status)) {\r
   //\r
   Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);\r
   if (!EFI_ERROR (Status)) {\r

diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.h b/SecurityPkg/HddPassword/HddPasswordDxe.h
index f695ca9454cb04dd7042ab26f9dae186d5b3acdb..87db587eb6f0439c4a8630132018b7e78826051d 100644 (file)
--- a/SecurityPkg/HddPassword/HddPasswordDxe.h
+++ b/SecurityPkg/HddPassword/HddPasswordDxe.h
@@ -88,7 +88,7 @@ typedef struct _HDD_PASSWORD_DXE_PRIVATE_DATA {
 #define HDD_PASSWORD_DXE_PRIVATE_FROM_THIS(a)  CR (a, HDD_PASSWORD_DXE_PRIVATE_DATA, ConfigAccess, HDD_PASSWORD_DXE_PRIVATE_SIGNATURE)\r
 \r
 //\r
 #define HDD_PASSWORD_DXE_PRIVATE_FROM_THIS(a)  CR (a, HDD_PASSWORD_DXE_PRIVATE_DATA, ConfigAccess, HDD_PASSWORD_DXE_PRIVATE_SIGNATURE)\r
 \r
 //\r

-//Iterate through the doule linked list. NOT delete safe\r
+//Iterate through the double linked list. NOT delete safe\r

 //\r
 #define EFI_LIST_FOR_EACH(Entry, ListHead)    \\r
   for (Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r
 //\r
 #define EFI_LIST_FOR_EACH(Entry, ListHead)    \\r
   for (Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r

diff --git a/SecurityPkg/HddPassword/HddPasswordStrings.uni b/SecurityPkg/HddPassword/HddPasswordStrings.uni
index 188c40f349b0cacb1a123940a68bb95909a58c50..b6fddffced003427e968216267f1dba5809fafae 100644 (file)
--- a/SecurityPkg/HddPassword/HddPasswordStrings.uni
+++ b/SecurityPkg/HddPassword/HddPasswordStrings.uni
@@ -16,7 +16,7 @@
 #string STR_SECURITY_HDD_BANNER_ONE           #language en-US "Allows Access to Set, Modify and Clear HardDisk User and"\r
 #string STR_SECURITY_HDD_BANNER_TWO           #language en-US "Master Passwords."\r
 #string STR_SECURITY_HDD_BANNER_THREE         #language en-US "User Password need to be installed for Enabling Security."\r
 #string STR_SECURITY_HDD_BANNER_ONE           #language en-US "Allows Access to Set, Modify and Clear HardDisk User and"\r
 #string STR_SECURITY_HDD_BANNER_TWO           #language en-US "Master Passwords."\r
 #string STR_SECURITY_HDD_BANNER_THREE         #language en-US "User Password need to be installed for Enabling Security."\r

-#string STR_SECURITY_HDD_BANNER_FOUR          #language en-US "Master Password can be modified only when succesfully"\r
+#string STR_SECURITY_HDD_BANNER_FOUR          #language en-US "Master Password can be modified only when successfully"\r

 #string STR_SECURITY_HDD_BANNER_FIVE          #language en-US "unlocked with User Password in POST."\r
 \r
 #string STR_HDD_SECURITY_HD                   #language en-US "HDD Password"\r
 #string STR_SECURITY_HDD_BANNER_FIVE          #language en-US "unlocked with User Password in POST."\r
 \r
 #string STR_HDD_SECURITY_HD                   #language en-US "HDD Password"\r

diff --git a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
index 2a097826a003a54b67f1e4d666eff19582f87099..44ceebc488509e71ab821ecc036b096718058ad8 100644 (file)
--- a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
+++ b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
@@ -54,7 +54,7 @@ extern EFI_GUID gEfiVendorKeysNvGuid;
 \r
 ///\r
 ///  "VendorKeysNv" variable to record the out of band secure boot keys modification.\r
 \r
 ///\r
 ///  "VendorKeysNv" variable to record the out of band secure boot keys modification.\r

-///  This variable is a read-only NV varaible that indicates whether someone other than\r
+///  This variable is a read-only NV variable that indicates whether someone other than\r

 ///  the platform vendor has used a mechanism not defined by the UEFI Specification to\r
 ///  transition the system to setup mode or to update secure boot keys.\r
 ///\r
 ///  the platform vendor has used a mechanism not defined by the UEFI Specification to\r
 ///  transition the system to setup mode or to update secure boot keys.\r
 ///\r

diff --git a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h b/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
index 8da3deaf86d12af507dd2f617d03827ac76067c3..39febcb65588639c603012248f9eb4a38243f008 100644 (file)
--- a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
+++ b/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
@@ -29,8 +29,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // UEFI TCG2 library definition bit of the BIOS Information Flags\r
 //\r
 //\r
 // UEFI TCG2 library definition bit of the BIOS Information Flags\r
 //\r

-#define TCG2_BIOS_INFORMATION_FLAG_HIERACHY_CONTROL_STORAGE_DISABLE      BIT8\r
-#define TCG2_BIOS_INFORMATION_FLAG_HIERACHY_CONTROL_ENDORSEMENT_DISABLE  BIT9\r
+#define TCG2_BIOS_INFORMATION_FLAG_HIERARCHY_CONTROL_STORAGE_DISABLE      BIT8\r
+#define TCG2_BIOS_INFORMATION_FLAG_HIERARCHY_CONTROL_ENDORSEMENT_DISABLE  BIT9\r

 \r
 //\r
 // UEFI TCG2 library definition bit of the BIOS Storage Management Flags\r
 \r
 //\r
 // UEFI TCG2 library definition bit of the BIOS Storage Management Flags\r

diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
index 190065b63e5fb3fe4de173de70c14943ca2e8d2e..c25a56a14ca2fcef8d9d44bebb93af470e670181 100644 (file)
--- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
+++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
@@ -696,7 +696,7 @@ TcgGetTokenUINT64(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -713,7 +713,7 @@ TcgGetNextUINT8(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -729,7 +729,7 @@ TcgGetNextUINT16(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -745,7 +745,7 @@ TcgGetNextUINT32(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -761,7 +761,7 @@ TcgGetNextUINT64(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -1261,7 +1261,7 @@ TcgEnumLevel0Discovery(
   Get Feature code from the header.\r
 \r
   @param     DiscoveryHeader    The discovery header.\r
   Get Feature code from the header.\r
 \r
   @param     DiscoveryHeader    The discovery header.\r

-  @param     FeatureCode        reutrn the Feature code.\r
+  @param     FeatureCode        return the Feature code.\r

   @param     FeatureSize        return the Feature size.\r
 \r
   @retval    return the Feature code data.\r
   @param     FeatureSize        return the Feature size.\r
 \r
   @retval    return the Feature code data.\r

diff --git a/SecurityPkg/Include/Library/Tpm2CommandLib.h b/SecurityPkg/Include/Library/Tpm2CommandLib.h
index d78d5ee1bab6527a52be37ffdd0ca05b1e0d5b0a..ce381e786b2c275fd500112ef94d7521bdf5009e 100644 (file)
--- a/SecurityPkg/Include/Library/Tpm2CommandLib.h
+++ b/SecurityPkg/Include/Library/Tpm2CommandLib.h
@@ -585,7 +585,7 @@ Tpm2PcrAllocateBanks (
   NOTE:\r
   To simplify this function, leave returned CapabilityData for caller to unpack since there are\r
   many capability categories and only few categories will be used in firmware. It means the caller\r
   NOTE:\r
   To simplify this function, leave returned CapabilityData for caller to unpack since there are\r
   many capability categories and only few categories will be used in firmware. It means the caller\r

-  need swap the byte order for the feilds in CapabilityData.\r
+  need swap the byte order for the fields in CapabilityData.\r

 \r
   @param[in]  Capability         Group selection; determines the format of the response.\r
   @param[in]  Property           Further definition of information.\r
 \r
   @param[in]  Capability         Group selection; determines the format of the response.\r
   @param[in]  Property           Further definition of information.\r

diff --git a/SecurityPkg/Include/Library/TpmCommLib.h b/SecurityPkg/Include/Library/TpmCommLib.h
index b9aca60b82a0cbaf4ad4d09ca4377bc0f92cf718..7e102a6a117d555745e1d811780f48ff55ab4f9d 100644 (file)
--- a/SecurityPkg/Include/Library/TpmCommLib.h
+++ b/SecurityPkg/Include/Library/TpmCommLib.h
@@ -214,7 +214,7 @@ TisPcWaitRegisterBits (
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r

-  @param[out] BurstCount            Pointer to a buffer to store the got BurstConut.\r
+  @param[out] BurstCount            Pointer to a buffer to store the got BurstCount.\r

 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r
 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r

diff --git a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
index 2fc95537dc84b6460b837b592fc84e5190ab9e77..1b7320e91614c284d314f157d9fc8d89664ce903 100644 (file)
--- a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
+++ b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
@@ -26,10 +26,10 @@ typedef struct _HASH_INFO {
 //\r
 // This PPI carries prehashsed data for one FV.  Platform should ensure 1:1 mapping between pre-hashed PPI and corresponding FV.\r
 // The Count field in PPI is followed by Count number of FV hash info entries, which can be extended to PCR and logged to TCG event log directly by TCG modules.\r
 //\r
 // This PPI carries prehashsed data for one FV.  Platform should ensure 1:1 mapping between pre-hashed PPI and corresponding FV.\r
 // The Count field in PPI is followed by Count number of FV hash info entries, which can be extended to PCR and logged to TCG event log directly by TCG modules.\r

-// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with each pre-hased PPIs\r
+// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with each pre-hashed PPIs\r

 //   For each pre-hashed PPI\r
 //     If PPI carries hash generated by equivalent or larger algorithm set than TPM required, directly use PPI\r
 //   For each pre-hashed PPI\r
 //     If PPI carries hash generated by equivalent or larger algorithm set than TPM required, directly use PPI\r

-//     else, drops PPI data and cacluate all hash again\r
+//     else, drops PPI data and calculate all hash again\r

 //\r
 typedef struct {\r
   UINT32                                     FvBase;\r
 //\r
 typedef struct {\r
   UINT32                                     FvBase;\r

diff --git a/SecurityPkg/Library/AuthVariableLib/AuthService.c b/SecurityPkg/Library/AuthVariableLib/AuthService.c
index 486df55bed64f453805eebbce9e469761da44824..2f60331f2c048403b7d85311d23d17388124ea84 100644 (file)
--- a/SecurityPkg/Library/AuthVariableLib/AuthService.c
+++ b/SecurityPkg/Library/AuthVariableLib/AuthService.c
@@ -425,7 +425,7 @@ CheckSignatureListFormat(
   RsaContext = NULL;\r
 \r
   //\r
   RsaContext = NULL;\r
 \r
   //\r

-  // Walk throuth the input signature list and check the data format.\r
+  // Walk through the input signature list and check the data format.\r

   // If any signature is incorrectly formed, the whole check will fail.\r
   //\r
   while ((SigDataSize > 0) && (SigDataSize >= SigList->SignatureListSize)) {\r
   // If any signature is incorrectly formed, the whole check will fail.\r
   //\r
   while ((SigDataSize > 0) && (SigDataSize >= SigList->SignatureListSize)) {\r


@@ -1069,7 +1069,7 @@ AuthServiceInternalCompareTimeStamp (
   @param[out] Sha256Digest       Sha256 digest calculated.\r
 \r
   @return EFI_ABORTED          Digest process failed.\r
   @param[out] Sha256Digest       Sha256 digest calculated.\r
 \r
   @return EFI_ABORTED          Digest process failed.\r

-  @return EFI_SUCCESS          SHA256 Digest is succesfully calculated.\r
+  @return EFI_SUCCESS          SHA256 Digest is successfully calculated.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h b/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
index da2c40bc373e7c49c3078ccdbaf7aec9cc27fba5..2bec637f75bd712a4844ac2a0410cf46d0ba3fee 100644 (file)
--- a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
+++ b/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
@@ -159,7 +159,7 @@ DeleteCertsFromDb (
 /**\r
   Clean up signer's certificates for common authenticated variable\r
   by corresponding VariableName and VendorGuid from "certdb".\r
 /**\r
   Clean up signer's certificates for common authenticated variable\r
   by corresponding VariableName and VendorGuid from "certdb".\r

-  Sytem may break down during Timebased Variable update & certdb update,\r
+  System may break down during Timebased Variable update & certdb update,\r

   make them inconsistent,  this function is called in AuthVariable Init to ensure\r
   consistency\r
 \r
   make them inconsistent,  this function is called in AuthVariable Init to ensure\r
   consistency\r
 \r

diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
index e80fadbf059b35af1035e5e63c0c82a0e5bf4f54..122b3b0bf42228fcd59804068b92b35a5f23f785 100644 (file)
--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
+++ b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
@@ -96,7 +96,7 @@ VOID **mAuthVarAddressPointer[9];
 AUTH_VAR_LIB_CONTEXT_IN *mAuthVarLibContextIn = NULL;\r
 \r
 /**\r
 AUTH_VAR_LIB_CONTEXT_IN *mAuthVarLibContextIn = NULL;\r
 \r
 /**\r

-  Initialization for authenticated varibale services.\r
+  Initialization for authenticated variable services.\r

   If this initialization returns error status, other APIs will not work\r
   and expect to be not called then.\r
 \r
   If this initialization returns error status, other APIs will not work\r
   and expect to be not called then.\r
 \r


@@ -382,7 +382,7 @@ AuthVariableLibInitialize (
   @retval EFI_INVALID_PARAMETER     Invalid parameter.\r
   @retval EFI_WRITE_PROTECTED       Variable is write-protected.\r
   @retval EFI_OUT_OF_RESOURCES      There is not enough resource.\r
   @retval EFI_INVALID_PARAMETER     Invalid parameter.\r
   @retval EFI_WRITE_PROTECTED       Variable is write-protected.\r
   @retval EFI_OUT_OF_RESOURCES      There is not enough resource.\r

-  @retval EFI_SECURITY_VIOLATION    The variable is with EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS\r
+  @retval EFI_SECURITY_VIOLATION    The variable is with EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS\r

                                     set, but the AuthInfo does NOT pass the validation\r
                                     check carried out by the firmware.\r
   @retval EFI_UNSUPPORTED           Unsupported to process authenticated variable.\r
                                     set, but the AuthInfo does NOT pass the validation\r
                                     check carried out by the firmware.\r
   @retval EFI_UNSUPPORTED           Unsupported to process authenticated variable.\r

diff --git a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
index 38448f0c8c86442522efe353817f4dff6f1582ef..e4ddff21b54fb8deed0884d992b83c30d6047ead 100644 (file)
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
+++ b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
@@ -49,7 +49,7 @@ DxeImageAuthenticationStatusHandler (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Register image authenticaion status check handler.\r
+  Register image authentication status check handler.\r

 \r
   @param  ImageHandle   ImageHandle of the loaded driver.\r
   @param  SystemTable   Pointer to the EFI System Table.\r
 \r
   @param  ImageHandle   ImageHandle of the loaded driver.\r
   @param  SystemTable   Pointer to the EFI System Table.\r

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index fe4cdccedd5a1397480a4862973581cd8fa544ba..a0a12b50ddd1ddf32449ded83addb2725b426d7b 100644 (file)
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -745,7 +745,7 @@ AddImageExeInfo (
   if (ImageExeInfoTable != NULL) {\r
     //\r
     // The table has been found!\r
   if (ImageExeInfoTable != NULL) {\r
     //\r
     // The table has been found!\r

-    // We must enlarge the table to accomodate the new exe info entry.\r
+    // We must enlarge the table to accommodate the new exe info entry.\r

     //\r
     ImageExeInfoTableSize = GetImageExeInfoTableSize (ImageExeInfoTable);\r
   } else {\r
     //\r
     ImageExeInfoTableSize = GetImageExeInfoTableSize (ImageExeInfoTable);\r
   } else {\r


@@ -947,7 +947,7 @@ Done:
 \r
   @param[in]  VariableName        Name of database variable that is searched in.\r
   @param[in]  Signature           Pointer to signature that is searched for.\r
 \r
   @param[in]  VariableName        Name of database variable that is searched in.\r
   @param[in]  Signature           Pointer to signature that is searched for.\r

-  @param[in]  CertType            Pointer to hash algrithom.\r
+  @param[in]  CertType            Pointer to hash algorithm.\r

   @param[in]  SignatureSize       Size of Signature.\r
 \r
   @return TRUE                    Found the signature in the variable database.\r
   @param[in]  SignatureSize       Size of Signature.\r
 \r
   @return TRUE                    Found the signature in the variable database.\r


@@ -992,7 +992,7 @@ IsSignatureFoundInDatabase (
     goto Done;\r
   }\r
   //\r
     goto Done;\r
   }\r
   //\r

-  // Enumerate all signature data in SigDB to check if executable's signature exists.\r
+  // Enumerate all signature data in SigDB to check if signature exists for executable.\r

   //\r
   CertList = (EFI_SIGNATURE_LIST *) Data;\r
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {\r
   //\r
   CertList = (EFI_SIGNATURE_LIST *) Data;\r
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {\r


@@ -1844,7 +1844,7 @@ DxeImageVerificationHandler (
 \r
   if (OffSet != (SecDataDir->VirtualAddress + SecDataDir->Size)) {\r
     //\r
 \r
   if (OffSet != (SecDataDir->VirtualAddress + SecDataDir->Size)) {\r
     //\r

-    // The Size in Certificate Table or the attribute certicate table is corrupted.\r
+    // The Size in Certificate Table or the attribute certificate table is corrupted.\r

     //\r
     VerifyStatus = EFI_ACCESS_DENIED;\r
   }\r
     //\r
     VerifyStatus = EFI_ACCESS_DENIED;\r
   }\r


@@ -1855,7 +1855,7 @@ DxeImageVerificationHandler (
     Status = EFI_ACCESS_DENIED;\r
     if (Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED || Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND) {\r
       //\r
     Status = EFI_ACCESS_DENIED;\r
     if (Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED || Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND) {\r
       //\r

-      // Get image hash value as executable's signature.\r
+      // Get image hash value as signature of executable.\r

       //\r
       SignatureListSize = sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 + mImageDigestSize;\r
       SignatureList     = (EFI_SIGNATURE_LIST *) AllocateZeroPool (SignatureListSize);\r
       //\r
       SignatureListSize = sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 + mImageDigestSize;\r
       SignatureList     = (EFI_SIGNATURE_LIST *) AllocateZeroPool (SignatureListSize);\r

diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
index 00593289501c3c30bb90cad6f1d5ccdddf408ce8..28807d4d98b34a33f7dd31ff724f7b12a11f711b 100644 (file)
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
+++ b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
@@ -2,7 +2,7 @@
 \r
   This library registers RSA 2048 SHA 256 guided section handler\r
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.\r
 \r
   This library registers RSA 2048 SHA 256 guided section handler\r
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.\r

-  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r


@@ -213,7 +213,7 @@ Rsa2048Sha256GuidedSectionHandler (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // All paths from here return EFI_SUCESS and result is returned in AuthenticationStatus\r
+  // All paths from here return EFI_SUCCESS and result is returned in AuthenticationStatus\r

   //\r
   Status = EFI_SUCCESS;\r
 \r
   //\r
   Status = EFI_SUCCESS;\r
 \r

diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
index 0822fd0856fe86e595b1ab7035b8251215d298a9..9c426edace48eb8814725bd4d7a2cab09cd93993 100644 (file)
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
+++ b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
@@ -3,7 +3,7 @@
 #  ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 #\r
 #  ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 #\r

-#  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+#  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

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

diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
index 484bde0afc111c7ff2b051a4753a7805a8816377..f0294a68f51b67cecb973fe0752f44d7ec1e2140 100644 (file)
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
+++ b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
@@ -4,7 +4,7 @@
 // ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 //\r
 // ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 //\r

-// It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+// It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
index 543635b2e493abe0d2ec0887ebbe3a641b959417..04b9b0d7fbf39ebb7db67402327c27d1a93c3e2f 100644 (file)
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
@@ -362,7 +362,7 @@ Tcg2MeasurePeImage (
   if (Status == EFI_VOLUME_FULL) {\r
     //\r
     // Volume full here means the image is hashed and its result is extended to PCR.\r
   if (Status == EFI_VOLUME_FULL) {\r
     //\r
     // Volume full here means the image is hashed and its result is extended to PCR.\r

-    // But the event log cann't be saved since log area is full.\r
+    // But the event log can't be saved since log area is full.\r

     // Just return EFI_SUCCESS in order not to block the image load.\r
     //\r
     Status = EFI_SUCCESS;\r
     // Just return EFI_SUCCESS in order not to block the image load.\r
     //\r
     Status = EFI_SUCCESS;\r


@@ -541,7 +541,7 @@ DxeTpm2MeasureBootHandler (
     }\r
     //\r
     // The PE image from unmeasured Firmware volume need be measured\r
     }\r
     //\r
     // The PE image from unmeasured Firmware volume need be measured\r

-    // The PE image from measured Firmware volume will be mearsured according to policy below.\r
+    // The PE image from measured Firmware volume will be measured according to policy below.\r

     //   If it is driver, do not measure\r
     //   If it is application, still measure.\r
     //\r
     //   If it is driver, do not measure\r
     //   If it is application, still measure.\r
     //\r

diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index a2d3923ca658f26eed1c545c59a26fd9a7a808ea..1f2eed29a1df390f2e06c376b270f7e5c2c44b33 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
@@ -649,7 +649,7 @@ TcgMeasurePeImage (
   if (Status == EFI_OUT_OF_RESOURCES) {\r
     //\r
     // Out of resource here means the image is hashed and its result is extended to PCR.\r
   if (Status == EFI_OUT_OF_RESOURCES) {\r
     //\r
     // Out of resource here means the image is hashed and its result is extended to PCR.\r

-    // But the event log cann't be saved since log area is full.\r
+    // But the event log can't be saved since log area is full.\r

     // Just return EFI_SUCCESS in order not to block the image load.\r
     //\r
     Status = EFI_SUCCESS;\r
     // Just return EFI_SUCCESS in order not to block the image load.\r
     //\r
     Status = EFI_SUCCESS;\r


@@ -838,7 +838,7 @@ DxeTpmMeasureBootHandler (
     }\r
     //\r
     // The PE image from unmeasured Firmware volume need be measured\r
     }\r
     //\r
     // The PE image from unmeasured Firmware volume need be measured\r

-    // The PE image from measured Firmware volume will be mearsured according to policy below.\r
+    // The PE image from measured Firmware volume will be measured according to policy below.\r

     //   If it is driver, do not measure\r
     //   If it is application, still measure.\r
     //\r
     //   If it is driver, do not measure\r
     //   If it is application, still measure.\r
     //\r

diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
index adf03bb226766bd8730c12b50be4c27294d6add0..061136ee786075592dd2b634e54b57122941049f 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
@@ -56,7 +56,7 @@ Tpm12MeasureAndLogData (
   TcgEvent = NULL;\r
 \r
   //\r
   TcgEvent = NULL;\r
 \r
   //\r

-  // Tpm active/deactive state is checked in HashLogExtendEvent\r
+  // Tpm activation state is checked in HashLogExtendEvent\r

   //\r
   Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol);\r
   if (EFI_ERROR(Status)){\r
   //\r
   Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol);\r
   if (EFI_ERROR(Status)){\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
index 9ca784a873286c496fe674f448c71efe63b3a073..52521b6444258ce6deca93ba2438b52ef339445d 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
+++ b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha1InternalHashInstance = {
 /**\r
   The function register SHA1 instance.\r
 \r
 /**\r
   The function register SHA1 instance.\r
 \r

-  @retval EFI_SUCCESS   SHA1 instance is registered, or system dose not surpport registr SHA1 instance\r
+  @retval EFI_SUCCESS   SHA1 instance is registered, or system does not support register SHA1 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
index 01fce3fd2b98e80881aae0aac1ce70367bec25c4..760e20bae0002ca754917e1c3a69a7f2a3be2058 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
+++ b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha256InternalHashInstance = {
 /**\r
   The function register SHA256 instance.\r
 \r
 /**\r
   The function register SHA256 instance.\r
 \r

-  @retval EFI_SUCCESS   SHA256 instance is registered, or system dose not surpport registr SHA256 instance\r
+  @retval EFI_SUCCESS   SHA256 instance is registered, or system does not support register SHA256 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
index 29f6c8a8281fe82a67672a9e0791b54c6ed34468..99e2416a8eceb11e896e6d46699f98b940950234 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
+++ b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha384InternalHashInstance = {
 /**\r
   The function register SHA384 instance.\r
 \r
 /**\r
   The function register SHA384 instance.\r
 \r

-  @retval EFI_SUCCESS   SHA384 instance is registered, or system dose not surpport registr SHA384 instance\r
+  @retval EFI_SUCCESS   SHA384 instance is registered, or system does not support register SHA384 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
index d5389e1e22090f2fb51456c6e6446f72a17a0c3d..b047791e028fddd7f0572f0dec36dbd7d7f9c3b4 100644 (file)
--- a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
+++ b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
@@ -127,7 +127,7 @@ HASH_INTERFACE  mSha512InternalHashInstance = {
 /**\r
   The function register SHA512 instance.\r
 \r
 /**\r
   The function register SHA512 instance.\r
 \r

-  @retval EFI_SUCCESS   SHA512 instance is registered, or system dose not surpport registr SHA512 instance\r
+  @retval EFI_SUCCESS   SHA512 instance is registered, or system does not support register SHA512 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
index f6819793ab8e2095d88b5c413dc83017e25501c2..bd24958505c342f2d3a3181618dab8232060b110 100644 (file)
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
+++ b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
@@ -29,7 +29,7 @@ TPM2_HASH_MASK mTpm2HashMask[] = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  The function get algorith from hash mask info.\r
+  The function get algorithm from hash mask info.\r

 \r
   @return Hash algorithm\r
 **/\r
 \r
   @return Hash algorithm\r
 **/\r

diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
index df16715120cb763f2a2bb74fe85dbd85222721ab..a759183d2012018c737afc9697309bb45ca7bda9 100644 (file)
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
+++ b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
@@ -2,7 +2,7 @@
 \r
   This library registers RSA 2048 SHA 256 guided section handler\r
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.\r
 \r
   This library registers RSA 2048 SHA 256 guided section handler\r
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.\r

-  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r


@@ -197,7 +197,7 @@ Rsa2048Sha256GuidedSectionHandler (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // All paths from here return EFI_SUCESS and result is returned in AuthenticationStatus\r
+  // All paths from here return EFI_SUCCESS and result is returned in AuthenticationStatus\r

   //\r
   Status = EFI_SUCCESS;\r
 \r
   //\r
   Status = EFI_SUCCESS;\r
 \r

diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
index 3fd5e5243066f5f6f8e41443567dc9133a73bc2e..dac97a050e8ff9c8b0a4f97ee8c451af1f59f31b 100644 (file)
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
+++ b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
@@ -3,7 +3,7 @@
 #  ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 #\r
 #  ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 #\r

-#  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+#  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

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

diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
index 484bde0afc111c7ff2b051a4753a7805a8816377..f0294a68f51b67cecb973fe0752f44d7ec1e2140 100644 (file)
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
+++ b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
@@ -4,7 +4,7 @@
 // ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 //\r
 // ExtractGuidedSectionLib service to register an RSA 2048 SHA 256 guided section handler\r
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.\r
 //\r

-// It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.\r
+// It uses the BaseCryptLib based on OpenSSL to authenticate the signature.\r

 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
index 1c072fac238c6f69f3084f1a50504c9d3f6c90e2..f9c57a13f2e4905fa1467b04e3cb5b6c3ff1c6fb 100644 (file)
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
+++ b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
@@ -1249,7 +1249,7 @@ TcgGetTokenByteSequence(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -1282,7 +1282,7 @@ TcgGetNextUINT8(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -1315,7 +1315,7 @@ TcgGetNextUINT16(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -1348,7 +1348,7 @@ TcgGetNextUINT32(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r


@@ -1370,7 +1370,7 @@ TcgGetNextUINT64(
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r
   Get next specify value.\r
 \r
   @param    ParseStruct   Input parse structure.\r

-  @param    Value         Return vlaue.\r
+  @param    Value         Return value.\r

 \r
   @retval   return the action result.\r
 \r
 \r
   @retval   return the action result.\r
 \r

diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
index d06ad62c91d5d05173ea28e317e2fd9529915bbc..b6d5cf9890a06e5e193814d761824f6ce77b7d9a 100644 (file)
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
+++ b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
@@ -810,7 +810,7 @@ TcgFindFeatureCallback(
   Get Feature code from the header.\r
 \r
   @param     DiscoveryHeader    The discovery header.\r
   Get Feature code from the header.\r
 \r
   @param     DiscoveryHeader    The discovery header.\r

-  @param     FeatureCode        reutrn the Feature code.\r
+  @param     FeatureCode        return the Feature code.\r

   @param     FeatureSize        return the Feature size.\r
 \r
   @retval    return the Feature code data.\r
   @param     FeatureSize        return the Feature size.\r
 \r
   @retval    return the Feature code data.\r

diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index bc52cceabd052d470b0e79cf7534e090d46ea6b4..b4927a0872a2c4cb12e7c6efe45d06b1f397b155 100644 (file)
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/TcgStorageOpalLib.h>\r
 #include "TcgStorageOpalLibInternal.h"\r
 \r
 #include <Library/TcgStorageOpalLib.h>\r
 #include "TcgStorageOpalLibInternal.h"\r
 \r

-#define OPAL_MSID_LENGHT        128\r
+#define OPAL_MSID_LENGTH        128\r

 \r
 /**\r
   Creates a session with OPAL_UID_ADMIN_SP as OPAL_ADMIN_SP_PSID_AUTHORITY, then reverts device using Admin SP Revert method.\r
 \r
 /**\r
   Creates a session with OPAL_UID_ADMIN_SP as OPAL_ADMIN_SP_PSID_AUTHORITY, then reverts device using Admin SP Revert method.\r


@@ -1095,7 +1095,7 @@ GetRevertTimeOut (
   OPAL_DISK_SUPPORT_ATTRIBUTE  SupportedAttributes;\r
   UINT16                       BaseComId;\r
   UINT32                       MsidLength;\r
   OPAL_DISK_SUPPORT_ATTRIBUTE  SupportedAttributes;\r
   UINT16                       BaseComId;\r
   UINT32                       MsidLength;\r

-  UINT8                        Msid[OPAL_MSID_LENGHT];\r
+  UINT8                        Msid[OPAL_MSID_LENGTH];\r

   UINT32                       RemovalMechanishLists[ResearvedMechanism];\r
   UINT8                        ActiveDataRemovalMechanism;\r
 \r
   UINT32                       RemovalMechanishLists[ResearvedMechanism];\r
   UINT8                        ActiveDataRemovalMechanism;\r
 \r


@@ -1104,7 +1104,7 @@ GetRevertTimeOut (
     return 0;\r
   }\r
 \r
     return 0;\r
   }\r
 \r

-  TcgResult = OpalUtilGetMsid (Session, Msid, OPAL_MSID_LENGHT, &MsidLength);\r
+  TcgResult = OpalUtilGetMsid (Session, Msid, OPAL_MSID_LENGTH, &MsidLength);\r

   if (TcgResult != TcgResultSuccess) {\r
     return 0;\r
   }\r
   if (TcgResult != TcgResultSuccess) {\r
     return 0;\r
   }\r

diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
index 609186fb7c01d4a462a2c6d5d6f5a0d30ef2ca07..8295a1d2675872027105aa21b505b24d6db58c46 100644 (file)
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
+++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
@@ -218,7 +218,7 @@ Tpm12NvWriteValue (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  DEBUG ((DEBUG_INFO, "Tpm12NvWritedValue - ReturnCode = %x\n", SwapBytes32 (Response.returnCode)));\r
+  DEBUG ((DEBUG_INFO, "Tpm12NvWriteValue - ReturnCode = %x\n", SwapBytes32 (Response.returnCode)));\r

   switch (SwapBytes32 (Response.returnCode)) {\r
   case TPM_SUCCESS:\r
     return EFI_SUCCESS;\r
   switch (SwapBytes32 (Response.returnCode)) {\r
   case TPM_SUCCESS:\r
     return EFI_SUCCESS;\r

diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
index 9c5b3d5740bafe8d6e53cbe998c30ee749759d5e..1caa076203ba3dd44d41ee92dc9766546c0c694e 100644 (file)
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
+++ b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
@@ -125,7 +125,7 @@ Tpm12TisPcWaitRegisterBits (
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r

-  @param[out] BurstCount            Pointer to a buffer to store the got BurstConut.\r
+  @param[out] BurstCount            Pointer to a buffer to store the got BurstCount.\r

 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r
 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
index 4e9f030e77477e0231e8d41a99f10df5f5415394..85b11c77158f012fbec9e4cdd25484e2b54742b4 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
@@ -53,7 +53,7 @@ typedef struct {
   NOTE:\r
   To simplify this function, leave returned CapabilityData for caller to unpack since there are\r
   many capability categories and only few categories will be used in firmware. It means the caller\r
   NOTE:\r
   To simplify this function, leave returned CapabilityData for caller to unpack since there are\r
   many capability categories and only few categories will be used in firmware. It means the caller\r

-  need swap the byte order for the feilds in CapabilityData.\r
+  need swap the byte order for the fields in CapabilityData.\r

 \r
   @param[in]  Capability         Group selection; determines the format of the response.\r
   @param[in]  Property           Further definition of information.\r
 \r
   @param[in]  Capability         Group selection; determines the format of the response.\r
   @param[in]  Property           Further definition of information.\r


@@ -119,7 +119,7 @@ Tpm2GetCapability (
   //\r
   *MoreData = RecvBuffer.MoreData;\r
   //\r
   //\r
   *MoreData = RecvBuffer.MoreData;\r
   //\r

-  // Does not unpack all possiable property here, the caller should unpack it and note the byte order.\r
+  // Does not unpack all possible property here, the caller should unpack it and note the byte order.\r

   //\r
   CopyMem (CapabilityData, &RecvBuffer.CapabilityData, RecvBufferSize - sizeof (TPM2_RESPONSE_HEADER) - sizeof (UINT8));\r
 \r
   //\r
   CopyMem (CapabilityData, &RecvBuffer.CapabilityData, RecvBufferSize - sizeof (TPM2_RESPONSE_HEADER) - sizeof (UINT8));\r
 \r

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
index 8e055967636af9ec764adf067aafcd248b2c1c74..dc36963c0e2ced2df5e34eef29225152f9f823fb 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
@@ -435,7 +435,7 @@ Tpm2HierarchyChangeAuth (
   WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(NewAuth->size));\r
   Buffer += sizeof(UINT16);\r
 \r
   WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(NewAuth->size));\r
   Buffer += sizeof(UINT16);\r
 \r

-  // New Authorizeation\r
+  // New Authorization\r

   CopyMem(Buffer, NewAuth->buffer, NewAuth->size);\r
   Buffer += NewAuth->size;\r
 \r
   CopyMem(Buffer, NewAuth->buffer, NewAuth->size);\r
   Buffer += NewAuth->size;\r
 \r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
index 53b9bc42fb6bc4f6388b9c2498dcb3405a5d82d7..42e1ecbce95a6bf7afc56cfcdb4130435d82111b 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
@@ -137,7 +137,7 @@ Tpm2RegisterTpm2DeviceLib (
 /**\r
   The function caches current active TPM interface type.\r
 \r
 /**\r
   The function caches current active TPM interface type.\r
 \r

-  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system dose not surpport registr DTPM2.0 instance\r
+  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system does not support register DTPM2.0 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
index 435cbf62985d67e7597e94bc3ec011b1ce08324e..691eaa40c04537ff631dda37f585cb3bf40c53db 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
@@ -93,7 +93,7 @@ TPM2_DEVICE_INTERFACE  mDTpm2InternalTpm2Device = {
 /**\r
   The function register DTPM2.0 instance and caches current active TPM interface type.\r
 \r
 /**\r
   The function register DTPM2.0 instance and caches current active TPM interface type.\r
 \r

-  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system dose not surpport registr DTPM2.0 instance\r
+  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system does not support register DTPM2.0 instance\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
index 8596143b535cb529e9701b7097272e347d9071ba..b671cef04ed7fc627a2aa73778265c0db09e5edc 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
@@ -327,7 +327,7 @@ PtpCrbTpmCommand (
 \r
 GoReady_Exit:\r
   //\r
 \r
 GoReady_Exit:\r
   //\r

-  // Goto Ready State if command is completed succesfully and TPM support IdleBypass\r
+  // Goto Ready State if command is completed successfully and TPM support IdleBypass\r

   // If not supported. flow down to GoIdle\r
   //\r
   if (PcdGet8(PcdCRBIdleByPass) == 1) {\r
   // If not supported. flow down to GoIdle\r
   //\r
   if (PcdGet8(PcdCRBIdleByPass) == 1) {\r


@@ -347,7 +347,7 @@ GoIdle_Exit:
   MmioWrite32((UINTN)&CrbReg->CrbControlRequest, PTP_CRB_CONTROL_AREA_REQUEST_GO_IDLE);\r
 \r
   //\r
   MmioWrite32((UINTN)&CrbReg->CrbControlRequest, PTP_CRB_CONTROL_AREA_REQUEST_GO_IDLE);\r
 \r
   //\r

-  // Only enforce Idle state transition if execution fails when CRBIndleBypass==1\r
+  // Only enforce Idle state transition if execution fails when CRBIdleBypass==1\r

   // Leave regular Idle delay at the beginning of next command execution\r
   //\r
   if (PcdGet8(PcdCRBIdleByPass) == 1){\r
   // Leave regular Idle delay at the beginning of next command execution\r
   //\r
   if (PcdGet8(PcdCRBIdleByPass) == 1){\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
index d2ce8d1f095db2f751cca3248d3849d9d399eb39..bbebc94b4d01db66268c8e5c4a64f91002a91f49 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
@@ -81,7 +81,7 @@ TisPcWaitRegisterBits (
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r

-  @param[out] BurstCount            Pointer to a buffer to store the got BurstConut.\r
+  @param[out] BurstCount            Pointer to a buffer to store the got BurstCount.\r

 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r
 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r


@@ -303,7 +303,7 @@ Tpm2TisTpmCommand (
                TIS_TIMEOUT_B\r
                );\r
     //\r
                TIS_TIMEOUT_B\r
                );\r
     //\r

-    // Do not clear CANCEL bit here bicoz Writes of 0 to this bit are ignored\r
+    // Do not clear CANCEL bit here because Writes of 0 to this bit are ignored\r

     //\r
     if (EFI_ERROR (Status)) {\r
       //\r
     //\r
     if (EFI_ERROR (Status)) {\r
       //\r

diff --git a/SecurityPkg/Library/TpmCommLib/CommonHeader.h b/SecurityPkg/Library/TpmCommLib/CommonHeader.h
index 386c9fab44d95caacf19dcc3d581d2ffab4347c2..aa2e412a116d4e3846810e1de8403ceee1211467 100644 (file)
--- a/SecurityPkg/Library/TpmCommLib/CommonHeader.h
+++ b/SecurityPkg/Library/TpmCommLib/CommonHeader.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  The intenal header file for TpmCommLib.\r
+  The internal header file for TpmCommLib.\r

 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r

diff --git a/SecurityPkg/Library/TpmCommLib/TisPc.c b/SecurityPkg/Library/TpmCommLib/TisPc.c
index 162e883d2170e89d9a82993df12159fae96be9e1..4a14a2bf819339e43cd4ea0d36676ee74c5e9de1 100644 (file)
--- a/SecurityPkg/Library/TpmCommLib/TisPc.c
+++ b/SecurityPkg/Library/TpmCommLib/TisPc.c
@@ -64,7 +64,7 @@ TisPcWaitRegisterBits (
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r
   in the time of default TIS_TIMEOUT_D.\r
 \r
   @param[in]  TisReg                Pointer to TIS register.\r

-  @param[out] BurstCount            Pointer to a buffer to store the got BurstConut.\r
+  @param[out] BurstCount            Pointer to a buffer to store the got BurstCount.\r

 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r
 \r
   @retval     EFI_SUCCESS           Get BurstCount.\r
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.\r

diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c b/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
index a113df37185311cac54bda68a03607a1c9a4c051..a96862f93733997bba76e20d0d439cf1f1b3c1ef 100644 (file)
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
+++ b/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
@@ -494,7 +494,7 @@ IsValidTimestamp (
     TsaCertSize = SigList->SignatureSize - sizeof (EFI_GUID);\r
 \r
     //\r
     TsaCertSize = SigList->SignatureSize - sizeof (EFI_GUID);\r
 \r
     //\r

-    // Each TSA Certificate will normally be in a seperate EFI_SIGNATURE_LIST\r
+    // Each TSA Certificate will normally be in a separate EFI_SIGNATURE_LIST\r

     // Leverage ImageTimestampVerify interface for Timestamp counterSignature Verification\r
     //\r
     if (ImageTimestampVerify (SignedData, SignedDataSize, TsaCert, TsaCertSize, &SigningTime)) {\r
     // Leverage ImageTimestampVerify interface for Timestamp counterSignature Verification\r
     //\r
     if (ImageTimestampVerify (SignedData, SignedDataSize, TsaCert, TsaCertSize, &SigningTime)) {\r


@@ -514,7 +514,7 @@ IsValidTimestamp (
 /**\r
   Check whether the PKCS7 signedData is revoked by verifying with the revoked\r
   certificates database, and if the signedData is timestamped, the embedded timestamp\r
 /**\r
   Check whether the PKCS7 signedData is revoked by verifying with the revoked\r
   certificates database, and if the signedData is timestamped, the embedded timestamp\r

-  couterSignature will be checked with the supplied timestamp database.\r
+  counterSignature will be checked with the supplied timestamp database.\r

 \r
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded PKCS7\r
                               signature.\r
 \r
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded PKCS7\r
                               signature.\r


@@ -657,8 +657,8 @@ P7CheckRevocationByHash (
       Status = EFI_SUCCESS;\r
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, &RevocationTime)) {\r
         //\r
       Status = EFI_SUCCESS;\r
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, &RevocationTime)) {\r
         //\r

-        // Use EFI_NOT_READY to identify the P7Data is not reovked, because the timestamping\r
-        // occured prior to the time of certificate revocation.\r
+        // Use EFI_NOT_READY to identify the P7Data is not revoked, because the timestamping\r
+        // occurred prior to the time of certificate revocation.\r

         //\r
         Status = EFI_NOT_READY;\r
       }\r
         //\r
         Status = EFI_NOT_READY;\r
       }\r


@@ -679,7 +679,7 @@ _Exit:
 /**\r
   Check whether the PKCS7 signedData is revoked by verifying with the revoked\r
   certificates database, and if the signedData is timestamped, the embedded timestamp\r
 /**\r
   Check whether the PKCS7 signedData is revoked by verifying with the revoked\r
   certificates database, and if the signedData is timestamped, the embedded timestamp\r

-  couterSignature will be checked with the supplied timestamp database.\r
+  counterSignature will be checked with the supplied timestamp database.\r

 \r
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded PKCS7\r
                               signature.\r
 \r
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded PKCS7\r
                               signature.\r


@@ -822,8 +822,8 @@ P7CheckRevocation (
       Status = EFI_SUCCESS;\r
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, &RevocationTime)) {\r
         //\r
       Status = EFI_SUCCESS;\r
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, &RevocationTime)) {\r
         //\r

-        // Use EFI_NOT_READY to identify the P7Data is not reovked, because the timestamping\r
-        // occured prior to the time of certificate revocation.\r
+        // Use EFI_NOT_READY to identify the P7Data is not revoked, because the timestamping\r
+        // occurred prior to the time of certificate revocation.\r

         //\r
         Status = EFI_NOT_READY;\r
       }\r
         //\r
         Status = EFI_NOT_READY;\r
       }\r


@@ -1261,7 +1261,7 @@ VerifyBuffer (
                );\r
     if (!EFI_ERROR (Status)) {\r
       //\r
                );\r
     if (!EFI_ERROR (Status)) {\r
       //\r

-      // The PKCS7 SignedData is reovked\r
+      // The PKCS7 SignedData is revoked\r

       //\r
       Status = EFI_SECURITY_VIOLATION;\r
       goto _Exit;\r
       //\r
       Status = EFI_SECURITY_VIOLATION;\r
       goto _Exit;\r


@@ -1413,7 +1413,7 @@ VerifySignature (
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r

-      // The PKCS7 SignedData is reovked\r
+      // The PKCS7 SignedData is revoked\r

       //\r
       return EFI_SECURITY_VIOLATION;\r
     }\r
       //\r
       return EFI_SECURITY_VIOLATION;\r
     }\r

diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c b/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
index 59789533b0f23273fa9d3a60be4f3dc5e70dc485..e7dd5ab1811117f0af5064994641aaa6d9d586ee 100644 (file)
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
+++ b/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
@@ -79,7 +79,7 @@ RdRandGetSeed128 (
   UINT32      Index2;\r
 \r
   //\r
   UINT32      Index2;\r
 \r
   //\r

-  // Chose an arbitary key and zero the feed_forward_value (FFV)\r
+  // Chose an arbitrary key and zero the feed_forward_value (FFV)\r

   //\r
   for (Index = 0; Index < 16; Index++) {\r
     Key[Index] = (UINT8) Index;\r
   //\r
   for (Index = 0; Index < 16; Index++) {\r
     Key[Index] = (UINT8) Index;\r

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 8249bf0220004a63da7ce9a00b2a85f806e5b5df..cac36caf0a0d1aa460169aeb858b980092364e12 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -68,11 +68,11 @@
   #\r
   Tcg2PhysicalPresenceLib|Include/Library/Tcg2PhysicalPresenceLib.h\r
 \r
   #\r
   Tcg2PhysicalPresenceLib|Include/Library/Tcg2PhysicalPresenceLib.h\r
 \r

-  ## @libraryclass  Provides interfaces about TCG storage generic commond.\r
+  ## @libraryclass  Provides interfaces about TCG storage generic command.\r

   #\r
   TcgStorageCoreLib|Include/Library/TcgStorageCoreLib.h\r
 \r
   #\r
   TcgStorageCoreLib|Include/Library/TcgStorageCoreLib.h\r
 \r

-  ## @libraryclass  Provides interfaces about TCG storage Opal generic commond.\r
+  ## @libraryclass  Provides interfaces about TCG storage Opal generic command.\r

   #\r
   TcgStorageOpalLib|Include/Library/TcgStorageOpalLib.h\r
 \r
   #\r
   TcgStorageOpalLib|Include/Library/TcgStorageOpalLib.h\r
 \r


@@ -369,9 +369,9 @@
   # @Prompt TPM device address.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0xFED40000|UINT64|0x00010012\r
 \r
   # @Prompt TPM device address.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0xFED40000|UINT64|0x00010012\r
 \r

-  ## This PCR means the OEM configurated number of PCR banks.\r
+  ## This PCR means the OEM configured number of PCR banks.\r

   #  0 means dynamic get from supported HASH algorithm\r
   #  0 means dynamic get from supported HASH algorithm\r

-  # @Prompt OEM configurated number of PCR banks.\r
+  # @Prompt OEM configured number of PCR banks.\r

   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks|0x0|UINT32|0x00010015\r
 \r
   ## Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks|0x0|UINT32|0x00010015\r
 \r
   ## Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images\r


@@ -469,7 +469,7 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016\r
 \r
   ## This PCD indicates current active TPM interface type.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016\r
 \r
   ## This PCD indicates current active TPM interface type.\r

-  #  Accodingt to TCG PTP spec 1.3, there are 3 types defined in TPM2_PTP_INTERFACE_TYPE.<BR>\r
+  #  According to TCG PTP spec 1.3, there are 3 types defined in TPM2_PTP_INTERFACE_TYPE.<BR>\r

   #  0x00 - FIFO interface as defined in TIS 1.3 is active.<BR>\r
   #  0x01 - FIFO interface as defined in PTP for TPM 2.0 is active.<BR>\r
   #  0x02 - CRB interface is active.<BR>\r
   #  0x00 - FIFO interface as defined in TIS 1.3 is active.<BR>\r
   #  0x01 - FIFO interface as defined in PTP for TPM 2.0 is active.<BR>\r
   #  0x02 - CRB interface is active.<BR>\r


@@ -478,14 +478,14 @@
   # @Prompt current active TPM interface type.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType|0xFF|UINT8|0x0001001E\r
 \r
   # @Prompt current active TPM interface type.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType|0xFF|UINT8|0x0001001E\r
 \r

-  ## This PCD records IdleByass status supported by current active TPM interface.\r
-  #  Accodingt to TCG PTP spec 1.3, TPM with CRB interface can skip idle state and\r
-  #  diretcly move to CmdReady state. <BR>\r
+  ## This PCD records IdleBypass status supported by current active TPM interface.\r
+  #  According to TCG PTP spec 1.3, TPM with CRB interface can skip idle state and\r
+  #  directly move to CmdReady state. <BR>\r

   #  0x00 - Do not support IdleByPass.<BR>\r
   #  0x01 - Support IdleByPass.<BR>\r
   #  0xFF - IdleByPass State is not synced with TPM hardware.<BR>\r
   #\r
   #  0x00 - Do not support IdleByPass.<BR>\r
   #  0x01 - Support IdleByPass.<BR>\r
   #  0xFF - IdleByPass State is not synced with TPM hardware.<BR>\r
   #\r

-  # @Prompt IdleByass status supported by current active TPM interface.\r
+  # @Prompt IdleBypass status supported by current active TPM interface.\r

   gEfiSecurityPkgTokenSpaceGuid.PcdCRBIdleByPass|0xFF|UINT8|0x0001001F\r
 \r
   ## This PCD records LAML field in TPM2 ACPI table.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdCRBIdleByPass|0xFF|UINT8|0x0001001F\r
 \r
   ## This PCD records LAML field in TPM2 ACPI table.\r

diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index aef2ac3a208d715848b549a539ae929eaa313f93..9a254087a34a13a0ef9e698d6235c99cdff1bdba 100644 (file)
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -70,7 +70,7 @@
 [LibraryClasses.ARM]\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r
 [LibraryClasses.ARM]\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r

-  # This library provides the instrinsic functions generate by a given compiler.\r
+  # This library provides the intrinsic functions generate by a given compiler.\r

   # And NULL mean link this library into all ARM images.\r
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
   # And NULL mean link this library into all ARM images.\r
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r

diff --git a/SecurityPkg/SecurityPkg.uni b/SecurityPkg/SecurityPkg.uni
index ee79b98f0d5586627b0e7e6bb4a7517ff26126f9..68587304d779a87c74edfe0a17d1ae8acc7fc7da 100644 (file)
--- a/SecurityPkg/SecurityPkg.uni
+++ b/SecurityPkg/SecurityPkg.uni
@@ -80,7 +80,7 @@
 \r
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTpmPhysicalPresence_PROMPT  #language en-US "Physical presence of the platform operator."\r
 \r
 \r
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTpmPhysicalPresence_PROMPT  #language en-US "Physical presence of the platform operator."\r
 \r

-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTpmPhysicalPresence_HELP  #language en-US "Indicates the presence or absence of the platform operator during firmware booting. If platform operator is not physical presnece during boot. TPM will be locked and the TPM commands that required operator physical presence can not run.<BR><BR>\n"\r
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTpmPhysicalPresence_HELP  #language en-US "Indicates the presence or absence of the platform operator during firmware booting. If platform operator is not physical presence during boot. TPM will be locked and the TPM commands that required operator physical presence can not run.<BR><BR>\n"\r

                                                                                        "TRUE  - The platform operator is physically present.<BR>\n"\r
                                                                                        "FALSE - The platform operator is not physically present.<BR>"\r
 \r
                                                                                        "TRUE  - The platform operator is physically present.<BR>\n"\r
                                                                                        "FALSE - The platform operator is not physically present.<BR>"\r
 \r


@@ -176,9 +176,9 @@
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdRsa2048Sha256PublicKeyBuffer_HELP  #language en-US "Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images\n"\r
                                                                                                 "WARNING: The default value is treated as test key. Please do not use default value in the production."\r
 \r
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdRsa2048Sha256PublicKeyBuffer_HELP  #language en-US "Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to verify Recovery and Capsule Update images\n"\r
                                                                                                 "WARNING: The default value is treated as test key. Please do not use default value in the production."\r
 \r

-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_PROMPT  #language en-US "OEM configurated number of PCR banks."\r
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_PROMPT  #language en-US "OEM configured number of PCR banks."\r

 \r
 \r

-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_HELP  #language en-US "This PCR means the OEM configurated number of PCR banks.\n"\r
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_HELP  #language en-US "This PCR means the OEM configured number of PCR banks.\n"\r

                                                                                         "0 means dynamic get from supported HASH algorithm"\r
 \r
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2HashAlgorithmBitmap_PROMPT  #language en-US "Hash Algorithm bitmap."\r
                                                                                         "0 means dynamic get from supported HASH algorithm"\r
 \r
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2HashAlgorithmBitmap_PROMPT  #language en-US "Hash Algorithm bitmap."\r


@@ -256,10 +256,10 @@
                                                                                           "0x02 - CRB interface is active.<BR>\n"\r
                                                                                           "0xFF - Contains no current active TPM interface type<BR>"\r
 \r
                                                                                           "0x02 - CRB interface is active.<BR>\n"\r
                                                                                           "0xFF - Contains no current active TPM interface type<BR>"\r
 \r

-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_PROMPT  #language en-US "IdleByass status supported by current active TPM interface."\r
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_PROMPT  #language en-US "IdleBypass status supported by current active TPM interface."\r

 \r
 \r

-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_HELP  #language en-US "This PCD records IdleByass status supported by current active TPM interface.\n"\r
-                                                                                          "Accodingt to TCG PTP spec 1.3, TPM with CRB interface can skip idle state and diretcly move to CmdReady state. <BR>"\r
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_HELP  #language en-US "This PCD records IdleBypass status supported by current active TPM interface.\n"\r
+                                                                                          "According to TCG PTP spec 1.3, TPM with CRB interface can skip idle state and directly move to CmdReady state. <BR>"\r

                                                                                           "0x01 - Do not support IdleByPass.<BR>\n"\r
                                                                                           "0x02 - Support IdleByPass.<BR>\n"\r
                                                                                           "0xFF - IdleByPass State is not synced with TPM hardware.<BR>"\r
                                                                                           "0x01 - Do not support IdleByPass.<BR>\n"\r
                                                                                           "0x02 - Support IdleByPass.<BR>\n"\r
                                                                                           "0xFF - IdleByPass State is not synced with TPM hardware.<BR>"\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
index afbecbc00db70f90c5b6843e7ff310d313eaf779..97e819edf4d59b46fbbedc30fce0528d306b418c 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCG MOR (Memory Overwrite Request) Control Driver.\r
 \r
 /** @file\r
   TCG MOR (Memory Overwrite Request) Control Driver.\r
 \r

-  This driver initilize MemoryOverwriteRequestControl variable. It\r
+  This driver initialize MemoryOverwriteRequestControl variable. It\r

   will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also do TPer Reset for\r
   those encrypted drives through EFI_STORAGE_SECURITY_COMMAND_PROTOCOL at EndOfDxe.\r
 \r
   will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also do TPer Reset for\r
   those encrypted drives through EFI_STORAGE_SECURITY_COMMAND_PROTOCOL at EndOfDxe.\r
 \r


@@ -298,7 +298,7 @@ TPerResetAtEndOfDxe (
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCEESS\r
+  @retval EFI_SUCCESS\r

   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r
   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r


@@ -341,7 +341,7 @@ MorDriverEntryPoint (
     //\r
     // Create a Ready To Boot Event and Clear the MorControl bit in the call back function.\r
     //\r
     //\r
     // Create a Ready To Boot Event and Clear the MorControl bit in the call back function.\r
     //\r

-    DEBUG ((DEBUG_INFO, "TcgMor: Create ReadyToBoot Event for MorControl Bit cleanning!\n"));\r
+    DEBUG ((DEBUG_INFO, "TcgMor: Create ReadyToBoot Event for MorControl Bit cleaning!\n"));\r

     Status = EfiCreateEventReadyToBootEx (\r
                TPL_CALLBACK,\r
                OnReadyToBoot,\r
     Status = EfiCreateEventReadyToBootEx (\r
                TPL_CALLBACK,\r
                OnReadyToBoot,\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index de624423a69bb9760048ba97ccb7c01a5235fa46..906bafa04acb87c4b3a6e31f5c0d231a9daa74c7 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-#  Initilizes MemoryOverwriteRequestControl variable\r
+#  initializes MemoryOverwriteRequestControl variable\r

 #\r
 #  This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also do\r
 #  TPer Reset for those encrypted drives through EFI_STORAGE_SECURITY_COMMAND_PROTOCOL\r
 #\r
 #  This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also do\r
 #  TPer Reset for those encrypted drives through EFI_STORAGE_SECURITY_COMMAND_PROTOCOL\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
index 0c499e7d1a4a4b6c221e2d5fbf7f03efb1965f01..6a1df10394e52a1adbc341b5cb5863439866f8b4 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
@@ -1,5 +1,5 @@
 // /** @file\r
 // /** @file\r

-// Initilizes MemoryOverwriteRequestControl variable\r
+// initializes MemoryOverwriteRequestControl variable\r

 //\r
 // This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set.\r
 //\r
 //\r
 // This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set.\r
 //\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
index ef49fd928e83c987b298131c5e1f7f0fd7d0955c..aa230eeefa75f199c5e7925f89c9ad1d5281b0ed 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCG MOR (Memory Overwrite Request) Lock Control Driver.\r
 \r
 /** @file\r
   TCG MOR (Memory Overwrite Request) Lock Control Driver.\r
 \r

-  This driver initilize MemoryOverwriteRequestControlLock variable.\r
+  This driver initializes MemoryOverwriteRequestControlLock variable.\r

   This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 \r
 Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
   This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 \r
 Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -167,7 +167,7 @@ SetVariableCheckHandlerMor (
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCEESS\r
+  @retval EFI_SUCCESS\r

   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r
   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
index 2ef194f92f84ebeefc69d8c6d18d9189fedc16e4..5a6658c158e8db2029e9ab85d44fce8a335d6dc8 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
@@ -119,7 +119,7 @@ SetVariableCheckHandlerMor (
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCEESS\r
+  @retval EFI_SUCCESS\r

   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r
   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
index 639a3edcba2f565b53091cdccbfe44d8d793af5f..711b37d8668ad6f688352b33f7a4aadf6858f2d8 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
@@ -1,5 +1,5 @@
 // /** @file\r
 // /** @file\r

-// Initilizes MemoryOverwriteRequestControlLock variable\r
+// Initializes MemoryOverwriteRequestControlLock variable\r

 //\r
 // This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 //\r
 //\r
 // This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 //\r


@@ -10,7 +10,7 @@
 // **/\r
 \r
 \r
 // **/\r
 \r
 \r

-#string STR_MODULE_ABSTRACT             #language en-US "Initilizes MemoryOverwriteRequestControlLock variable"\r
+#string STR_MODULE_ABSTRACT             #language en-US "Initializes MemoryOverwriteRequestControlLock variable"\r

 \r
 #string STR_MODULE_DESCRIPTION          #language en-US "This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once."\r
 \r
 \r
 #string STR_MODULE_DESCRIPTION          #language en-US "This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once."\r
 \r

diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
index 67d6bda2697abdb6e6147b4bec6b78e2c1a4c3a7..875c1e5f3a38429264aedf08fc261012dd75fe44 100644 (file)
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-#  Initilizes MemoryOverwriteRequestControlLock variable\r
+#  Initializes MemoryOverwriteRequestControlLock variable\r

 #\r
 #  This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 #\r
 #\r
 #  This module will add Variable Hook and allow MemoryOverwriteRequestControlLock variable set only once.\r
 #\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
index e14fa32354ea09c7665e661c95ba0dcbe48e7c63..77905d2bf9ed97361738380f9aacee75507d6ace 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
@@ -2583,7 +2583,7 @@ OpalDriverGetDriverDeviceName(
   @param ImageHandle     Image Handle this driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r
   @param ImageHandle     Image Handle this driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r

-  @retval EFI_SUCESS     This function always complete successfully.\r
+  @retval EFI_SUCCESS     This function always complete successfully.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -2637,7 +2637,7 @@ EfiDriverEntryPoint(
   Tests to see if this driver supports a given controller.\r
 \r
   This function checks to see if the controller contains an instance of the\r
   Tests to see if this driver supports a given controller.\r
 \r
   This function checks to see if the controller contains an instance of the\r

-  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL and the EFI_BLOCK_IO_PROTOCL\r
+  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL and the EFI_BLOCK_IO_PROTOCOL\r

   and returns EFI_SUCCESS if it does.\r
 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   and returns EFI_SUCCESS if it does.\r
 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r


@@ -2741,7 +2741,7 @@ OpalEfiDriverBindingSupported(
   "controller", which is a child Handle, contains the EF_STORAGE_SECURITY_COMMAND protocols.\r
   This function will complete the other necessary checks, such as verifying the device supports\r
   the correct version of Opal.  Upon verification, it will add the device to the\r
   "controller", which is a child Handle, contains the EF_STORAGE_SECURITY_COMMAND protocols.\r
   This function will complete the other necessary checks, such as verifying the device supports\r
   the correct version of Opal.  Upon verification, it will add the device to the\r

-  Opal HII list in order to expose Opal managmeent options.\r
+  Opal HII list in order to expose Opal management options.\r

 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  ControllerHandle      The Handle of the controller to start. This Handle\r
 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  ControllerHandle      The Handle of the controller to start. This Handle\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
index beeabb1c0ae25a1795ef1ff32882e9db3dfee26a..c19d78218ec9e83d9de14d2cc8a0bda9376f3b0c 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
@@ -61,7 +61,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL   gOpalDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL   gOpalComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gOpalComponentName2;\r
 \r
 extern EFI_COMPONENT_NAME_PROTOCOL   gOpalComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gOpalComponentName2;\r
 \r

-#define OPAL_MSID_LENGHT        128\r
+#define OPAL_MSID_LENGTH        128\r

 \r
 #define MAX_PASSWORD_TRY_COUNT  5\r
 \r
 \r
 #define MAX_PASSWORD_TRY_COUNT  5\r
 \r


@@ -131,7 +131,7 @@ typedef struct {
 //\r
 typedef struct {\r
   UINT32                                          MsidLength;             // Byte length of MSID Pin for device\r
 //\r
 typedef struct {\r
   UINT32                                          MsidLength;             // Byte length of MSID Pin for device\r

-  UINT8                                           Msid[OPAL_MSID_LENGHT]; // MSID Pin for device\r
+  UINT8                                           Msid[OPAL_MSID_LENGTH]; // MSID Pin for device\r

   EFI_STORAGE_SECURITY_COMMAND_PROTOCOL           *Sscp;\r
   UINT32                                          MediaId;                // MediaId is used by Ssc Protocol.\r
   EFI_DEVICE_PATH_PROTOCOL                        *OpalDevicePath;\r
   EFI_STORAGE_SECURITY_COMMAND_PROTOCOL           *Sscp;\r
   UINT32                                          MediaId;                // MediaId is used by Ssc Protocol.\r
   EFI_DEVICE_PATH_PROTOCOL                        *OpalDevicePath;\r


@@ -309,7 +309,7 @@ OpalEfiDriverBindingSupported(
   "controller", which is a child handle, contains the EF_STORAGE_SECURITY_COMMAND protocols.\r
   This function will complete the other necessary checks, such as verifying the device supports\r
   the correct version of Opal.  Upon verification, it will add the device to the\r
   "controller", which is a child handle, contains the EF_STORAGE_SECURITY_COMMAND protocols.\r
   This function will complete the other necessary checks, such as verifying the device supports\r
   the correct version of Opal.  Upon verification, it will add the device to the\r

-  Opal HII list in order to expose Opal managmeent options.\r
+  Opal HII list in order to expose Opal management options.\r

 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  ControllerHandle      The handle of the controller to start. This handle\r
 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  ControllerHandle      The handle of the controller to start. This handle\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
index 18b65da756d63e66b0dca38b6a236d9a14bae296..ef117d3d031eb3b069c45efd63eefb1f21d33bac 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
@@ -1090,7 +1090,7 @@ OpalHiiSetBrowserData (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Populate the hii_g_Configuraton with the browser Data.\r
+  Populate the hii_g_Configuration with the browser Data.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -1164,7 +1164,7 @@ HiiSetFormString(
 \r
   @param Dev                  The Opal device.\r
 \r
 \r
   @param Dev                  The Opal device.\r
 \r

-  @retval EFI_SUCESS          Initialize the device success.\r
+  @retval EFI_SUCCESS          Initialize the device success.\r

   @retval EFI_DEVICE_ERROR    Get info from device failed.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR    Get info from device failed.\r
 \r
 **/\r


@@ -1193,7 +1193,7 @@ OpalDiskInitialize (
   }\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   }\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r

-  TcgResult = OpalUtilGetMsid (&Session, Dev->OpalDisk.Msid, OPAL_MSID_LENGHT, &Dev->OpalDisk.MsidLength);\r
+  TcgResult = OpalUtilGetMsid (&Session, Dev->OpalDisk.Msid, OPAL_MSID_LENGTH, &Dev->OpalDisk.MsidLength);\r

   if (TcgResult != TcgResultSuccess) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (TcgResult != TcgResultSuccess) {\r
     return EFI_DEVICE_ERROR;\r
   }\r


@@ -1220,7 +1220,7 @@ OpalDiskInitialize (
 \r
   @param OpalDisk                The Opal device.\r
 \r
 \r
   @param OpalDisk                The Opal device.\r
 \r

-  @retval EFI_SUCESS             Get ownership success.\r
+  @retval EFI_SUCCESS             Get ownership success.\r

   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r


@@ -1254,7 +1254,7 @@ OpalDiskUpdateOwnerShip (
 \r
   @param OpalDisk                The Opal device.\r
 \r
 \r
   @param OpalDisk                The Opal device.\r
 \r

-  @retval EFI_SUCESS             Initialize the device success.\r
+  @retval EFI_SUCCESS             Initialize the device success.\r

   @retval EFI_DEVICE_ERROR       Get info from device failed.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r
   @retval EFI_DEVICE_ERROR       Get info from device failed.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index 89c709df991ed248a35f694ff145ae16dd2d35d2..0543a2ce493d34d6e0fb740b25319ff041c38cf9 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -156,7 +156,7 @@ OpalHiiSetBrowserData (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Populate the hii_g_Configuraton with the browser Data.\r
+  Populate the hii_g_Configuration with the browser Data.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -247,7 +247,7 @@ GetDiskNameStringId(
 \r
   @param OpalDisk                The Opal device.\r
 \r
 \r
   @param OpalDisk                The Opal device.\r
 \r

-  @retval EFI_SUCESS             Initialize the device success.\r
+  @retval EFI_SUCCESS             Initialize the device success.\r

   @retval EFI_DEVICE_ERROR       Get info from device failed.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r
   @retval EFI_DEVICE_ERROR       Get info from device failed.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r


@@ -348,7 +348,7 @@ HiiUninstall(
 \r
   @param Dev                  The Opal device.\r
 \r
 \r
   @param Dev                  The Opal device.\r
 \r

-  @retval EFI_SUCESS          Initialize the device success.\r
+  @retval EFI_SUCCESS          Initialize the device success.\r

   @retval EFI_DEVICE_ERROR    Get info from device failed.\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR    Get info from device failed.\r
 \r
 **/\r


@@ -362,7 +362,7 @@ OpalDiskInitialize (
 \r
   @param OpalDisk                The Opal device.\r
 \r
 \r
   @param OpalDisk                The Opal device.\r
 \r

-  @retval EFI_SUCESS             Get ownership success.\r
+  @retval EFI_SUCCESS             Get ownership success.\r

   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change ownership.\r
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.\r
 \r

diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
index f25481044f89ff4c1b9cc5c026c8eb52d077a922..83c3ad50d1a249a2a95cb71130b738b7b726b9a6 100644 (file)
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
+++ b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
@@ -31,7 +31,7 @@ LockTpmPhysicalPresence (
   );\r
 \r
 //\r
   );\r
 \r
 //\r

-// Gobal defintions for lock physical presence PPI and its descriptor.\r
+// Global defintions for lock physical presence PPI and its descriptor.\r

 //\r
 PEI_LOCK_PHYSICAL_PRESENCE_PPI    mLockPhysicalPresencePpi = {\r
   LockTpmPhysicalPresence\r
 //\r
 PEI_LOCK_PHYSICAL_PRESENCE_PPI    mLockPhysicalPresencePpi = {\r
   LockTpmPhysicalPresence\r

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr b/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
index 12d8adb7eaebba2c6862bb33f48d91e3928cf332..91a463997c0ab6d88d6188bb770e85cc467371ef 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
@@ -16,19 +16,19 @@ formset
 \r
   efivarstore TCG2_CONFIGURATION_INFO,\r
     varid = TCG2_CONFIGURATION_INFO_VARSTORE_ID,\r
 \r
   efivarstore TCG2_CONFIGURATION_INFO,\r
     varid = TCG2_CONFIGURATION_INFO_VARSTORE_ID,\r

-    attribute = 0x02,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS\r
+    attribute = 0x02,  // EFI variable attributes  EFI_VARIABLE_BOOTSERVICE_ACCESS\r

     name  = TCG2_CONFIGURATION_INFO,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
   efivarstore TCG2_CONFIGURATION,\r
     varid = TCG2_CONFIGURATION_VARSTORE_ID,\r
     name  = TCG2_CONFIGURATION_INFO,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
   efivarstore TCG2_CONFIGURATION,\r
     varid = TCG2_CONFIGURATION_VARSTORE_ID,\r

-    attribute = 0x03,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
+    attribute = 0x03,  // EFI variable attributes  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r

     name  = TCG2_CONFIGURATION,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
   efivarstore TCG2_VERSION,\r
     varid = TCG2_VERSION_VARSTORE_ID,\r
     name  = TCG2_CONFIGURATION,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
   efivarstore TCG2_VERSION,\r
     varid = TCG2_VERSION_VARSTORE_ID,\r

-    attribute = 0x03,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
+    attribute = 0x03,  // EFI variable attributes  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r

     name  = TCG2_VERSION,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r
     name  = TCG2_VERSION,\r
     guid  = TCG2_CONFIG_FORM_SET_GUID;\r
 \r

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
index 9052eced757d2bb5b169cd5c87bfffe2a68777d1..10d1c5cc78004aec40393ee701b42c17b19b1053 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
@@ -240,7 +240,7 @@ InitializeTcg2VersionInfo (
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r

-  @retval EFI_SUCCES             All the related protocols are installed on the driver.\r
+  @retval EFI_SUCCESS            All the related protocols are installed on the driver.\r

   @retval Others                 Fail to install protocols as indicated.\r
 \r
 **/\r
   @retval Others                 Fail to install protocols as indicated.\r
 \r
 **/\r

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index a15919685ed505ef88942e7566960d2ef0ba3334..e0d0a207e1bf8da48edacfcd0b7ed3b549616095 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -57,7 +57,7 @@ DetectTpmDevice (
   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r

-  @retval EFI_SUCCES             Convert variable to PCD successfully.\r
+  @retval EFI_SUCCESS            Convert variable to PCD successfully.\r

   @retval Others                 Fail to convert variable to PCD.\r
 **/\r
 EFI_STATUS\r
   @retval Others                 Fail to convert variable to PCD.\r
 **/\r
 EFI_STATUS\r


@@ -118,7 +118,7 @@ Tcg2ConfigPeimEntryPoint (
 \r
   //\r
   // Convert variable to PCD.\r
 \r
   //\r
   // Convert variable to PCD.\r

-  // This is work-around because there is no gurantee DynamicHiiPcd can return correct value in DXE phase.\r
+  // This is work-around because there is no guarantee DynamicHiiPcd can return correct value in DXE phase.\r

   // Using DynamicPcd instead.\r
   //\r
   // NOTE: Tcg2Configuration variable contains the desired TpmDevice type,\r
   // Using DynamicPcd instead.\r
   //\r
   // NOTE: Tcg2Configuration variable contains the desired TpmDevice type,\r

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
index 4e67ac533f8c3376a821ecfbca3de9858387ab2e..347c6ab702c6a01a349ce383d3c07de25474dd2e 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
@@ -86,7 +86,7 @@ Tcg2DxeImageRead (
   @param[in]  PCRIndex       TPM PCR index\r
   @param[in]  ImageAddress   Start address of image buffer.\r
   @param[in]  ImageSize      Image size\r
   @param[in]  PCRIndex       TPM PCR index\r
   @param[in]  ImageAddress   Start address of image buffer.\r
   @param[in]  ImageSize      Image size\r

-  @param[out] DigestList     Digeest list of this image.\r
+  @param[out] DigestList     Digest list of this image.\r

 \r
   @retval EFI_SUCCESS            Successfully measure image.\r
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.\r
 \r
   @retval EFI_SUCCESS            Successfully measure image.\r
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.\r

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 85f2e0ae3809efd6ba412061b18db619aca7f997..3cd16c2fa33fdc69782c8bd277f1b9ebd23d2b0b 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -127,7 +127,7 @@ EFI_HANDLE mImageHandle;
   @param[in]  PCRIndex       TPM PCR index\r
   @param[in]  ImageAddress   Start address of image buffer.\r
   @param[in]  ImageSize      Image size\r
   @param[in]  PCRIndex       TPM PCR index\r
   @param[in]  ImageAddress   Start address of image buffer.\r
   @param[in]  ImageSize      Image size\r

-  @param[out] DigestList     Digeest list of this image.\r
+  @param[out] DigestList     Digest list of this image.\r

 \r
   @retval EFI_SUCCESS            Successfully measure image.\r
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.\r
 \r
   @retval EFI_SUCCESS            Successfully measure image.\r
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.\r

diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index f28f33fdec8331ade083d6b58c49309797185c0d..1565d4e402199714179467fad8924d3fadf0b63c 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -79,7 +79,7 @@ UINT32 mMeasuredMaxChildFvIndex = 0;
 UINT32 mMeasuredChildFvIndex = 0;\r
 \r
 /**\r
 UINT32 mMeasuredChildFvIndex = 0;\r
 \r
 /**\r

-  Measure and record the Firmware Volum Information once FvInfoPPI install.\r
+  Measure and record the Firmware Volume Information once FvInfoPPI install.\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -91,14 +91,14 @@ UINT32 mMeasuredChildFvIndex = 0;
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-FirmwareVolmeInfoPpiNotifyCallback (\r
+FirmwareVolumeInfoPpiNotifyCallback (\r

   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   );\r
 \r
 /**\r
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   );\r
 \r
 /**\r

-  Record all measured Firmware Volum Information into a Guid Hob\r
+  Record all measured Firmware Volume Information into a Guid Hob\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -120,12 +120,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback\r
+    FirmwareVolumeInfoPpiNotifyCallback\r

   },\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r
   },\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback\r
+    FirmwareVolumeInfoPpiNotifyCallback\r

   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r


@@ -136,7 +136,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Record all measured Firmware Volum Information into a Guid Hob\r
+  Record all measured Firmware Volume Information into a Guid Hob\r

   Guid Hob payload layout is\r
 \r
      UINT32 *************************** FIRMWARE_BLOB number\r
   Guid Hob payload layout is\r
 \r
      UINT32 *************************** FIRMWARE_BLOB number\r


@@ -688,7 +688,7 @@ MeasureMainBios (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Measure and record the Firmware Volum Information once FvInfoPPI install.\r
+  Measure and record the Firmware Volume Information once FvInfoPPI install.\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -700,7 +700,7 @@ MeasureMainBios (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-FirmwareVolmeInfoPpiNotifyCallback (\r
+FirmwareVolumeInfoPpiNotifyCallback (\r

   IN EFI_PEI_SERVICES               **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,\r
   IN VOID                           *Ppi\r
   IN EFI_PEI_SERVICES               **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,\r
   IN VOID                           *Ppi\r

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 14e4ed0ee1e0e3d4f2b277e519174e906b4cb0c0..bd786bf4791fb8c792ebb55cd0fd56a254a2516b 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
@@ -269,7 +269,7 @@ UpdatePPVersion (
 \r
 /**\r
   Patch interrupt resources returned by TPM _PRS. ResourceTemplate to patch is determined by input\r
 \r
 /**\r
   Patch interrupt resources returned by TPM _PRS. ResourceTemplate to patch is determined by input\r

-  interrupt buffer size. BufferSize, PkgLength and interrupt descirptor in ByteList need to be patched\r
+  interrupt buffer size. BufferSize, PkgLength and interrupt descriptor in ByteList need to be patched\r

 \r
   @param[in, out] Table            The TPM item in ACPI table.\r
   @param[in]      IrqBuffer        Input new IRQ buffer.\r
 \r
   @param[in, out] Table            The TPM item in ACPI table.\r
   @param[in]      IrqBuffer        Input new IRQ buffer.\r


@@ -304,7 +304,7 @@ UpdatePossibleResource (
   // to patch TPM ACPI object _PRS returned ResourceTemplate() containing 2 resource descriptors and an auto appended End Tag\r
   //\r
   //  AML data is organized by following rule.\r
   // to patch TPM ACPI object _PRS returned ResourceTemplate() containing 2 resource descriptors and an auto appended End Tag\r
   //\r
   //  AML data is organized by following rule.\r

-  //  Code need to patch BufferSize and PkgLength and interrupt descirptor in ByteList\r
+  //  Code need to patch BufferSize and PkgLength and interrupt descriptor in ByteList\r

   //\r
   // =============  Buffer ====================\r
   //           DefBuffer := BufferOp PkgLength BufferSize ByteList\r
   //\r
   // =============  Buffer ====================\r
   //           DefBuffer := BufferOp PkgLength BufferSize ByteList\r


@@ -321,8 +321,8 @@ UpdatePossibleResource (
   //                               <bit 3-0: Least significant package length nybble>\r
   //\r
   //==============BufferSize==================\r
   //                               <bit 3-0: Least significant package length nybble>\r
   //\r
   //==============BufferSize==================\r

-  //        BufferSize := Integar\r
-  //           Integar := ByteConst|WordConst|DwordConst....\r
+  //        BufferSize := Integer\r
+  //           Integer := ByteConst|WordConst|DwordConst....\r

   //\r
   //           ByteConst := BytePrefix ByteData\r
   //\r
   //\r
   //           ByteConst := BytePrefix ByteData\r
   //\r


@@ -371,7 +371,7 @@ UpdatePossibleResource (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // Include Memory32Fixed Descritor (12 Bytes) + Interrupt Descriptor header(5 Bytes) + End Tag(2 Bytes)\r
+      // Include Memory32Fixed Descriptor (12 Bytes) + Interrupt Descriptor header(5 Bytes) + End Tag(2 Bytes)\r

       //\r
       NewPkgLength += 19 + IrqBuffserSize;\r
       if (NewPkgLength > 63) {\r
       //\r
       NewPkgLength += 19 + IrqBuffserSize;\r
       if (NewPkgLength > 63) {\r


@@ -389,7 +389,7 @@ UpdatePossibleResource (
       *DataPtr = (UINT8)NewPkgLength;\r
 \r
       //\r
       *DataPtr = (UINT8)NewPkgLength;\r
 \r
       //\r

-      // 1.2 Patch BufferSize = sizeof(Memory32Fixed Descritor + Interrupt Descriptor + End Tag).\r
+      // 1.2 Patch BufferSize = sizeof(Memory32Fixed Descriptor + Interrupt Descriptor + End Tag).\r

       //      It is Little endian. So only patch lowest byte of BufferSize due to current interrupt number limit.\r
       //\r
       *(DataPtr + 2) = (UINT8)(IrqBuffserSize + 19);\r
       //      It is Little endian. So only patch lowest byte of BufferSize due to current interrupt number limit.\r
       //\r
       *(DataPtr + 2) = (UINT8)(IrqBuffserSize + 19);\r


@@ -445,7 +445,7 @@ UpdatePossibleResource (
         }\r
 \r
         //\r
         }\r
 \r
         //\r

-        // Include Memory32Fixed Descritor (12 Bytes) + Interrupt Descriptor header(5 Bytes) + End Tag(2  Bytes)\r
+        // Include Memory32Fixed Descriptor (12 Bytes) + Interrupt Descriptor header(5 Bytes) + End Tag(2  Bytes)\r

         //\r
         NewPkgLength += 19 + IrqBuffserSize;\r
 \r
         //\r
         NewPkgLength += 19 + IrqBuffserSize;\r
 \r


@@ -461,7 +461,7 @@ UpdatePossibleResource (
         *(DataPtr + 1) = (UINT8)((NewPkgLength & 0xFF0) >> 4);\r
 \r
         //\r
         *(DataPtr + 1) = (UINT8)((NewPkgLength & 0xFF0) >> 4);\r
 \r
         //\r

-        // 2.2 Patch BufferSize = sizeof(Memory32Fixed Descritor + Interrupt Descriptor + End Tag).\r
+        // 2.2 Patch BufferSize = sizeof(Memory32Fixed Descriptor + Interrupt Descriptor + End Tag).\r

         //     It is Little endian. Only patch lowest byte of BufferSize due to current interrupt number limit.\r
         //\r
         *(DataPtr + 2 + ((*DataPtr & (BIT7|BIT6)) >> 6)) = (UINT8)(IrqBuffserSize + 19);\r
         //     It is Little endian. Only patch lowest byte of BufferSize due to current interrupt number limit.\r
         //\r
         *(DataPtr + 2 + ((*DataPtr & (BIT7|BIT6)) >> 6)) = (UINT8)(IrqBuffserSize + 19);\r


@@ -485,7 +485,7 @@ UpdatePossibleResource (
   //\r
   DataPtr += NewPkgLength - (5 + IrqBuffserSize + 2);\r
   //\r
   //\r
   DataPtr += NewPkgLength - (5 + IrqBuffserSize + 2);\r
   //\r

-  //   3.1 Patch Length bit[7:0] of Interrupt descirptor patch interrupt descriptor\r
+  //   3.1 Patch Length bit[7:0] of Interrupt descriptor patch interrupt descriptor\r

   //\r
   *(DataPtr + 1) = (UINT8)(2 + IrqBuffserSize);\r
   //\r
   //\r
   *(DataPtr + 1) = (UINT8)(2 + IrqBuffserSize);\r
   //\r


@@ -498,7 +498,7 @@ UpdatePossibleResource (
   CopyMem(DataPtr + 5, IrqBuffer, IrqBuffserSize);\r
 \r
   //\r
   CopyMem(DataPtr + 5, IrqBuffer, IrqBuffserSize);\r
 \r
   //\r

-  // 4. Jump over Interrupt descirptor and Patch END Tag, set Checksum field to 0\r
+  // 4. Jump over Interrupt descriptor and Patch END Tag, set Checksum field to 0\r

   //\r
   DataPtr       += 5 + IrqBuffserSize;\r
   *DataPtr       = ACPI_END_TAG_DESCRIPTOR;\r
   //\r
   DataPtr       += 5 + IrqBuffserSize;\r
   *DataPtr       = ACPI_END_TAG_DESCRIPTOR;\r


@@ -715,7 +715,7 @@ PublishAcpiTable (
   mTcgNvs->IsShortFormPkgLength = IsShortFormPkgLength;\r
 \r
   //\r
   mTcgNvs->IsShortFormPkgLength = IsShortFormPkgLength;\r
 \r
   //\r

-  // Publish the TPM ACPI table. Table is re-checksumed.\r
+  // Publish the TPM ACPI table. Table is re-checksummed.\r

   //\r
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTable);\r
   ASSERT_EFI_ERROR (Status);\r
   //\r
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTable);\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
index 9c4b9afa46fa3672025683b32fab59c3d4c67a2d..7a91708a1a344016a763bb33581c737657beaea3 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
@@ -76,17 +76,17 @@ DefinitionBlock (
       Field (TNVS, AnyAcc, NoLock, Preserve)\r
       {\r
         PPIN,   8,  //   Software SMI for Physical Presence Interface\r
       Field (TNVS, AnyAcc, NoLock, Preserve)\r
       {\r
         PPIN,   8,  //   Software SMI for Physical Presence Interface\r

-        PPIP,   32, //   Used for save physical presence paramter\r
+        PPIP,   32, //   Used for save physical presence parameter\r

         PPRP,   32, //   Physical Presence request operation response\r
         PPRQ,   32, //   Physical Presence request operation\r
         PPRM,   32, //   Physical Presence request operation parameter\r
         LPPR,   32, //   Last Physical Presence request operation\r
         FRET,   32, //   Physical Presence function return code\r
         MCIN,   8,  //   Software SMI for Memory Clear Interface\r
         PPRP,   32, //   Physical Presence request operation response\r
         PPRQ,   32, //   Physical Presence request operation\r
         PPRM,   32, //   Physical Presence request operation parameter\r
         LPPR,   32, //   Last Physical Presence request operation\r
         FRET,   32, //   Physical Presence function return code\r
         MCIN,   8,  //   Software SMI for Memory Clear Interface\r

-        MCIP,   32, //   Used for save the Mor paramter\r
+        MCIP,   32, //   Used for save the Mor parameter\r

         MORD,   32, //   Memory Overwrite Request Data\r
         MRET,   32, //   Memory Overwrite function return code\r
         MORD,   32, //   Memory Overwrite Request Data\r
         MRET,   32, //   Memory Overwrite function return code\r

-        UCRQ,   32, //   Phyical Presence request operation to Get User Confirmation Status\r
+        UCRQ,   32, //   Physical Presence request operation to Get User Confirmation Status\r

         IRQN,   32, //   IRQ Number for _CRS\r
         SFRB,   8   //   Is shortformed Pkglength for resource buffer\r
       }\r
         IRQN,   32, //   IRQ Number for _CRS\r
         SFRB,   8   //   Is shortformed Pkglength for resource buffer\r
       }\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
index fb06624fdb8f182ac83578dbb54a2af080a79c04..8210548077085e505721a07dd90b7e1f52eb6239 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r

-  @retval EFI_SUCCES             All the related protocols are installed on the driver.\r
+  @retval EFI_SUCCESS            All the related protocols are installed on the driver.\r

   @retval Others                 Fail to install protocols as indicated.\r
 \r
 **/\r
   @retval Others                 Fail to install protocols as indicated.\r
 \r
 **/\r

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 6feb886308647fba2864a681b5031270ecb3c609..3990d1e937cb3d0418f92b130e0a17faf9b6b480 100644 (file)
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -79,7 +79,7 @@ EFI_TCG_CLIENT_ACPI_TABLE           mTcgClientAcpiTemplate = {
 \r
 //\r
 // The following EFI_TCG_SERVER_ACPI_TABLE default setting is just one example,\r
 \r
 //\r
 // The following EFI_TCG_SERVER_ACPI_TABLE default setting is just one example,\r

-// the TPM device connectes to LPC, and also defined the ACPI _UID as 0xFF,\r
+// the TPM device connects to LPC, and also defined the ACPI _UID as 0xFF,\r

 // this _UID can be changed and should match with the _UID setting of the TPM\r
 // ACPI device object\r
 //\r
 // this _UID can be changed and should match with the _UID setting of the TPM\r
 // ACPI device object\r
 //\r


@@ -1224,7 +1224,7 @@ InstallAcpiTable (
     mTcgClientAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);\r
     mTcgClientAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
     //\r
     mTcgClientAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);\r
     mTcgClientAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
     //\r

-    // The ACPI table must be checksumed before calling the InstallAcpiTable()\r
+    // The ACPI table must be checksummed before calling the InstallAcpiTable()\r

     // service of the ACPI table protocol to install it.\r
     //\r
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgClientAcpiTemplate, sizeof (mTcgClientAcpiTemplate));\r
     // service of the ACPI table protocol to install it.\r
     //\r
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgClientAcpiTemplate, sizeof (mTcgClientAcpiTemplate));\r


@@ -1244,7 +1244,7 @@ InstallAcpiTable (
     mTcgServerAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);\r
     mTcgServerAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
     //\r
     mTcgServerAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);\r
     mTcgServerAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
     //\r

-    // The ACPI table must be checksumed before calling the InstallAcpiTable()\r
+    // The ACPI table must be checksummed before calling the InstallAcpiTable()\r

     // service of the ACPI table protocol to install it.\r
     //\r
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgServerAcpiTemplate, sizeof (mTcgServerAcpiTemplate));\r
     // service of the ACPI table protocol to install it.\r
     //\r
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgServerAcpiTemplate, sizeof (mTcgServerAcpiTemplate));\r

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index 0adfcc50c5098f783415556c2c39cd92a6332eb3..284fc394f063d9d2e49c5710da488fe7e8c96075 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -85,7 +85,7 @@ PhysicalPresencePpiNotifyCallback (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Measure and record the Firmware Volum Information once FvInfoPPI install.\r
+  Measure and record the Firmware Volume Information once FvInfoPPI install.\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -97,14 +97,14 @@ PhysicalPresencePpiNotifyCallback (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-FirmwareVolmeInfoPpiNotifyCallback (\r
+FirmwareVolumeInfoPpiNotifyCallback (\r

   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   );\r
 \r
 /**\r
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   );\r
 \r
 /**\r

-  Record all measured Firmware Volum Information into a Guid Hob\r
+  Record all measured Firmware Volume Information into a Guid Hob\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -131,12 +131,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback\r
+    FirmwareVolumeInfoPpiNotifyCallback\r

   },\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r
   },\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback\r
+    FirmwareVolumeInfoPpiNotifyCallback\r

   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r


@@ -146,7 +146,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Record all measured Firmware Volum Information into a Guid Hob\r
+  Record all measured Firmware Voluem Information into a Guid Hob\r

   Guid Hob payload layout is\r
 \r
      UINT32 *************************** FIRMWARE_BLOB number\r
   Guid Hob payload layout is\r
 \r
      UINT32 *************************** FIRMWARE_BLOB number\r


@@ -501,7 +501,7 @@ MeasureMainBios (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Measure and record the Firmware Volum Information once FvInfoPPI install.\r
+  Measure and record the Firmware Voluem Information once FvInfoPPI install.\r

 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r
 \r
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param[in] NotifyDescriptor  Address of the notification descriptor data structure.\r


@@ -513,7 +513,7 @@ MeasureMainBios (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-FirmwareVolmeInfoPpiNotifyCallback (\r
+FirmwareVolumeInfoPpiNotifyCallback (\r

   IN EFI_PEI_SERVICES               **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,\r
   IN VOID                           *Ppi\r
   IN EFI_PEI_SERVICES               **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,\r
   IN VOID                           *Ppi\r


@@ -672,7 +672,7 @@ PhysicalPresencePpiNotifyCallback (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Check if TPM chip is activeated or not.\r
+  Check if TPM chip is activated or not.\r

 \r
   @param[in]      PeiServices   Describes the list of possible PEI Services.\r
 \r
 \r
   @param[in]      PeiServices   Describes the list of possible PEI Services.\r
 \r

diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
index 6ddc47ae91071c243fe5890e735f3468a56e4918..739067dbec0351e634d0fe9a8deb9024f84d0764 100644 (file)
--- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
+++ b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
@@ -64,16 +64,16 @@ DefinitionBlock (
       Field (TNVS, AnyAcc, NoLock, Preserve)\r
       {\r
         PPIN,   8,  //   Software SMI for Physical Presence Interface\r
       Field (TNVS, AnyAcc, NoLock, Preserve)\r
       {\r
         PPIN,   8,  //   Software SMI for Physical Presence Interface\r

-        PPIP,   32, //   Used for save physical presence paramter\r
+        PPIP,   32, //   Used for save physical presence parameter\r

         PPRP,   32, //   Physical Presence request operation response\r
         PPRQ,   32, //   Physical Presence request operation\r
         LPPR,   32, //   Last Physical Presence request operation\r
         FRET,   32, //   Physical Presence function return code\r
         MCIN,   8,  //   Software SMI for Memory Clear Interface\r
         PPRP,   32, //   Physical Presence request operation response\r
         PPRQ,   32, //   Physical Presence request operation\r
         LPPR,   32, //   Last Physical Presence request operation\r
         FRET,   32, //   Physical Presence function return code\r
         MCIN,   8,  //   Software SMI for Memory Clear Interface\r

-        MCIP,   32, //   Used for save the Mor paramter\r
+        MCIP,   32, //   Used for save the Mor parameter\r

         MORD,   32, //   Memory Overwrite Request Data\r
         MRET,   32, //   Memory Overwrite function return code\r
         MORD,   32, //   Memory Overwrite Request Data\r
         MRET,   32, //   Memory Overwrite function return code\r

-        UCRQ,   32  //   Phyical Presence request operation to Get User Confirmation Status\r
+        UCRQ,   32  //   Physical Presence request operation to Get User Confirmation Status\r

       }\r
 \r
       Method (PTS, 1, Serialized)\r
       }\r
 \r
       Method (PTS, 1, Serialized)\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
index 6c0294151e6ca3cf7bb021a4cdd6b7808bf9c615..8936a0a634cf20d47adab835b40b11e65ef41139 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r
 \r
   @retval EFI_ALREADY_STARTED    The driver already exists in system.\r
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of resources.\r

-  @retval EFI_SUCCES             All the related protocols are installed on the driver.\r
+  @retval EFI_SUCCESS            All the related protocols are installed on the driver.\r

   @retval Others                 Fail to get the SecureBootEnable variable.\r
 \r
 **/\r
   @retval Others                 Fail to get the SecureBootEnable variable.\r
 \r
 **/\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
index 55a42392528e6acdfffcc22d680e4fed2b85240c..573efa6379a0b07582ed93e357f0ae5fbae2ac81 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-#  Provides the capbility to configure secure boot in a setup browser\r
+#  Provides the capability to configure secure boot in a setup browser\r

 #  By this module, user may change the content of DB, DBX, PK and KEK.\r
 #\r
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  By this module, user may change the content of DB, DBX, PK and KEK.\r
 #\r
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
index 56097deee56f933be7855e7722cfae06ca99956a..4e9c6f3ff79ae94d789d2fbdfc6fb2e40578982e 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
@@ -1,5 +1,5 @@
 // /** @file\r
 // /** @file\r

-// Provides the capbility to configure secure boot in a setup browser\r
+// Provides the capability to configure secure boot in a setup browser\r

 //\r
 // By this module, user may change the content of DB, DBX, PK and KEK.\r
 //\r
 //\r
 // By this module, user may change the content of DB, DBX, PK and KEK.\r
 //\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index a15038da123a82d92fbb6db9e742dc888e12de5a..83497a23f52d3ff2ba41b8bdf0d777361329c614 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -234,7 +234,7 @@ SaveSecureBootVariable (
                                    it's caller's responsibility to free the memory when finish using it.\r
 \r
   @retval EFI_SUCCESS              Create time based payload successfully.\r
                                    it's caller's responsibility to free the memory when finish using it.\r
 \r
   @retval EFI_SUCCESS              Create time based payload successfully.\r

-  @retval EFI_OUT_OF_RESOURCES     There are not enough memory resourses to create time based payload.\r
+  @retval EFI_OUT_OF_RESOURCES     There are not enough memory resources to create time based payload.\r

   @retval EFI_INVALID_PARAMETER    The parameter is invalid.\r
   @retval Others                   Unexpected error happens.\r
 \r
   @retval EFI_INVALID_PARAMETER    The parameter is invalid.\r
   @retval Others                   Unexpected error happens.\r
 \r


@@ -390,7 +390,7 @@ SetSecureBootMode (
   @param[out]  PkCert                Point to the data buffer to store the signature list.\r
 \r
   @return EFI_UNSUPPORTED            Unsupported Key Length.\r
   @param[out]  PkCert                Point to the data buffer to store the signature list.\r
 \r
   @return EFI_UNSUPPORTED            Unsupported Key Length.\r

-  @return EFI_OUT_OF_RESOURCES       There are not enough memory resourses to form the signature list.\r
+  @return EFI_OUT_OF_RESOURCES       There are not enough memory resources to form the signature list.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -507,7 +507,7 @@ EnrollPlatformKey (
   DEBUG ((EFI_D_INFO, "FilePostFix = %s\n", FilePostFix));\r
 \r
   //\r
   DEBUG ((EFI_D_INFO, "FilePostFix = %s\n", FilePostFix));\r
 \r
   //\r

-  // Prase the selected PK file and generature PK certificate list.\r
+  // Prase the selected PK file and generate PK certificate list.\r

   //\r
   Status = CreatePkX509SignatureList (\r
             Private->FileContext->FHandle,\r
   //\r
   Status = CreatePkX509SignatureList (\r
             Private->FileContext->FHandle,\r


@@ -1088,7 +1088,7 @@ IsSignatureFoundInDatabase (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Enumerate all signature data in SigDB to check if executable's signature exists.\r
+  // Enumerate all signature data in SigDB to check if signature exists for executable.\r

   //\r
   CertList = (EFI_SIGNATURE_LIST *) Data;\r
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {\r
   //\r
   CertList = (EFI_SIGNATURE_LIST *) Data;\r
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {\r


@@ -1312,7 +1312,7 @@ Done:
 /**\r
   Check whether the signature list exists in given variable data.\r
 \r
 /**\r
   Check whether the signature list exists in given variable data.\r
 \r

-  It searches the signature list for the ceritificate hash by CertType.\r
+  It searches the signature list for the certificate hash by CertType.\r

   If the signature list is found, get the offset of Database for the\r
   next hash of a certificate.\r
 \r
   If the signature list is found, get the offset of Database for the\r
   next hash of a certificate.\r
 \r


@@ -2107,7 +2107,7 @@ HashPeImageByType (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Enroll a new executable's signature into Signature Database.\r
+  Enroll a new signature of executable into Signature Database.\r

 \r
   @param[in] PrivateData     The module's private data.\r
   @param[in] VariableName    Variable name of signature database, must be\r
 \r
   @param[in] PrivateData     The module's private data.\r
   @param[in] VariableName    Variable name of signature database, must be\r


@@ -2177,7 +2177,7 @@ EnrollAuthentication2Descriptor (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Diretly set AUTHENTICATION_2 data to SetVariable\r
+  // Directly set AUTHENTICATION_2 data to SetVariable\r

   //\r
   Status = gRT->SetVariable(\r
                   VariableName,\r
   //\r
   Status = gRT->SetVariable(\r
                   VariableName,\r


@@ -2208,7 +2208,7 @@ ON_EXIT:
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Enroll a new executable's signature into Signature Database.\r
+  Enroll a new signature of executable into Signature Database.\r

 \r
   @param[in] PrivateData     The module's private data.\r
   @param[in] VariableName    Variable name of signature database, must be\r
 \r
   @param[in] PrivateData     The module's private data.\r
   @param[in] VariableName    Variable name of signature database, must be\r


@@ -2247,7 +2247,7 @@ EnrollImageSignatureToSigDB (
   // Form the SigDB certificate list.\r
   // Format the data item into EFI_SIGNATURE_LIST type.\r
   //\r
   // Form the SigDB certificate list.\r
   // Format the data item into EFI_SIGNATURE_LIST type.\r
   //\r

-  // We need to parse executable's signature data from specified signed executable file.\r
+  // We need to parse signature data of executable from specified signed executable file.\r

   // In current implementation, we simply trust the pass-in signed executable file.\r
   // In reality, it's OS's responsibility to verify the signed executable file.\r
   //\r
   // In current implementation, we simply trust the pass-in signed executable file.\r
   // In reality, it's OS's responsibility to verify the signed executable file.\r
   //\r


@@ -3269,7 +3269,7 @@ SecureBootExtractConfigFromVariable (
   SecureBootMode   = NULL;\r
 \r
   //\r
   SecureBootMode   = NULL;\r
 \r
   //\r

-  // Initilize the Date and Time using system time.\r
+  // Initialize the Date and Time using system time.\r

   //\r
   ConfigData->CertificateFormat = HASHALG_RAW;\r
   ConfigData->AlwaysRevocation = TRUE;\r
   //\r
   ConfigData->CertificateFormat = HASHALG_RAW;\r
   ConfigData->AlwaysRevocation = TRUE;\r


@@ -3306,7 +3306,7 @@ SecureBootExtractConfigFromVariable (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Check SecureBootEnable & Pk status, fix the inconsistence.\r
+  // Check SecureBootEnable & Pk status, fix the inconsistency.\r

   // If the SecureBootEnable Variable doesn't exist, hide the SecureBoot Enable/Disable\r
   // Checkbox.\r
   //\r
   // If the SecureBootEnable Variable doesn't exist, hide the SecureBoot Enable/Disable\r
   // Checkbox.\r
   //\r


@@ -3314,7 +3314,7 @@ SecureBootExtractConfigFromVariable (
   GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL);\r
 \r
   //\r
   GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL);\r
 \r
   //\r

-  // Fix Pk, SecureBootEnable inconsistence\r
+  // Fix Pk and SecureBootEnable inconsistency\r

   //\r
   if ((SetupMode != NULL) && (*SetupMode) == USER_MODE) {\r
     ConfigData->HideSecureBoot = FALSE;\r
   //\r
   if ((SetupMode != NULL) && (*SetupMode) == USER_MODE) {\r
     ConfigData->HideSecureBoot = FALSE;\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
index 32e9619e91ccf8b81d027d1ed9ff0ca9a17fcf3f..1fafae07ac2a61912a76743ef22ebff83e78b472 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
@@ -172,7 +172,7 @@ typedef struct {
   CURRENT_VARIABLE_NAME             VariableName;     // The variable name we are processing.\r
   UINT32                            ListCount;        // Record current variable has how many signature list.\r
   UINTN                             ListIndex;        // Record which signature list is processing.\r
   CURRENT_VARIABLE_NAME             VariableName;     // The variable name we are processing.\r
   UINT32                            ListCount;        // Record current variable has how many signature list.\r
   UINTN                             ListIndex;        // Record which signature list is processing.\r

-  BOOLEAN                           *CheckArray;      // Record whcih siganture data checked.\r
+  BOOLEAN                           *CheckArray;      // Record which signature data checked.\r

 } SECUREBOOT_CONFIG_PRIVATE_DATA;\r
 \r
 extern SECUREBOOT_CONFIG_PRIVATE_DATA      mSecureBootConfigPrivateDateTemplate;\r
 } SECUREBOOT_CONFIG_PRIVATE_DATA;\r
 \r
 extern SECUREBOOT_CONFIG_PRIVATE_DATA      mSecureBootConfigPrivateDateTemplate;\r


@@ -182,7 +182,7 @@ extern SECUREBOOT_CONFIG_PRIVATE_DATA      *gSecureBootPrivateData;
 #define SECUREBOOT_CONFIG_PRIVATE_FROM_THIS(a)  CR (a, SECUREBOOT_CONFIG_PRIVATE_DATA, ConfigAccess, SECUREBOOT_CONFIG_PRIVATE_DATA_SIGNATURE)\r
 \r
 //\r
 #define SECUREBOOT_CONFIG_PRIVATE_FROM_THIS(a)  CR (a, SECUREBOOT_CONFIG_PRIVATE_DATA, ConfigAccess, SECUREBOOT_CONFIG_PRIVATE_DATA_SIGNATURE)\r
 \r
 //\r

-// Cryptograhpic Key Information\r
+// Cryptographic Key Information\r

 //\r
 #pragma pack(1)\r
 typedef struct _CPL_KEY_INFO {\r
 //\r
 #pragma pack(1)\r
 typedef struct _CPL_KEY_INFO {\r


@@ -448,12 +448,12 @@ CleanUpPage (
 \r
 /**\r
   Read file content into BufferPtr, the size of the allocate buffer\r
 \r
 /**\r
   Read file content into BufferPtr, the size of the allocate buffer\r

-  is *FileSize plus AddtionAllocateSize.\r
+  is *FileSize plus AdditionAllocateSize.\r

 \r
   @param[in]       FileHandle            The file to be read.\r
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated buffer.\r
   @param[out]      FileSize              Size of input file\r
 \r
   @param[in]       FileHandle            The file to be read.\r
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated buffer.\r
   @param[out]      FileSize              Size of input file\r

-  @param[in]       AddtionAllocateSize   Addtion size the buffer need to be allocated.\r
+  @param[in]       AdditionAllocateSize   Addition size the buffer need to be allocated.\r

                                          In case the buffer need to contain others besides the file content.\r
 \r
   @retval   EFI_SUCCESS                  The file was read into the buffer.\r
                                          In case the buffer need to contain others besides the file content.\r
 \r
   @retval   EFI_SUCCESS                  The file was read into the buffer.\r


@@ -467,7 +467,7 @@ ReadFileContent (
   IN      EFI_FILE_HANDLE           FileHandle,\r
   IN OUT  VOID                      **BufferPtr,\r
      OUT  UINTN                     *FileSize,\r
   IN      EFI_FILE_HANDLE           FileHandle,\r
   IN OUT  VOID                      **BufferPtr,\r
      OUT  UINTN                     *FileSize,\r

-  IN      UINTN                     AddtionAllocateSize\r
+  IN      UINTN                     AdditionAllocateSize\r

   );\r
 \r
 \r
   );\r
 \r
 \r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
index f5ce94e06dc832e99a12a41b8e6f3c50a8c5911f..3730fbe64649d6911a7b480340195668171a1eaf 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
@@ -10,12 +10,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 /**\r
   Read file content into BufferPtr, the size of the allocate buffer\r
 \r
 /**\r
   Read file content into BufferPtr, the size of the allocate buffer\r

-  is *FileSize plus AddtionAllocateSize.\r
+  is *FileSize plus AdditionAllocateSize.\r

 \r
   @param[in]       FileHandle            The file to be read.\r
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated buffer.\r
   @param[out]      FileSize              Size of input file\r
 \r
   @param[in]       FileHandle            The file to be read.\r
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated buffer.\r
   @param[out]      FileSize              Size of input file\r

-  @param[in]       AddtionAllocateSize   Addtion size the buffer need to be allocated.\r
+  @param[in]       AdditionAllocateSize   Addition size the buffer need to be allocated.\r

                                          In case the buffer need to contain others besides the file content.\r
 \r
   @retval   EFI_SUCCESS                  The file was read into the buffer.\r
                                          In case the buffer need to contain others besides the file content.\r
 \r
   @retval   EFI_SUCCESS                  The file was read into the buffer.\r


@@ -29,7 +29,7 @@ ReadFileContent (
   IN      EFI_FILE_HANDLE           FileHandle,\r
   IN OUT  VOID                      **BufferPtr,\r
      OUT  UINTN                     *FileSize,\r
   IN      EFI_FILE_HANDLE           FileHandle,\r
   IN OUT  VOID                      **BufferPtr,\r
      OUT  UINTN                     *FileSize,\r

-  IN      UINTN                     AddtionAllocateSize\r
+  IN      UINTN                     AdditionAllocateSize\r

   )\r
 \r
 {\r
   )\r
 \r
 {\r


@@ -62,7 +62,7 @@ ReadFileContent (
     goto ON_EXIT;\r
   }\r
 \r
     goto ON_EXIT;\r
   }\r
 \r

-  BufferSize = (UINTN) SourceFileSize + AddtionAllocateSize;\r
+  BufferSize = (UINTN) SourceFileSize + AdditionAllocateSize;\r

   Buffer =  AllocateZeroPool(BufferSize);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   Buffer =  AllocateZeroPool(BufferSize);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
index 8ea551d88eb5463519ffcbe4da07339e0686725e..6e54a4b0f21cea73a041b4845dc8335478270618 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
@@ -122,7 +122,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 typedef struct {\r
   BOOLEAN AttemptSecureBoot;   // Attempt to enable/disable Secure Boot\r
 //\r
 typedef struct {\r
   BOOLEAN AttemptSecureBoot;   // Attempt to enable/disable Secure Boot\r

-  BOOLEAN HideSecureBoot;      // Hiden Attempt Secure Boot\r
+  BOOLEAN HideSecureBoot;      // Hidden Attempt Secure Boot\r

   CHAR16  SignatureGuid[SECURE_BOOT_GUID_STORAGE_SIZE];\r
   BOOLEAN PhysicalPresent;     // If a Physical Present User\r
   UINT8   SecureBootMode;      // Secure Boot Mode: Standard Or Custom\r
   CHAR16  SignatureGuid[SECURE_BOOT_GUID_STORAGE_SIZE];\r
   BOOLEAN PhysicalPresent;     // If a Physical Present User\r
   UINT8   SecureBootMode;      // Secure Boot Mode: Standard Or Custom\r


@@ -132,7 +132,7 @@ typedef struct {
   UINT8   CertificateFormat;   // The type of the certificate\r
   EFI_HII_DATE RevocationDate; // The revocation date of the certificate\r
   EFI_HII_TIME RevocationTime; // The revocation time of the certificate\r
   UINT8   CertificateFormat;   // The type of the certificate\r
   EFI_HII_DATE RevocationDate; // The revocation date of the certificate\r
   EFI_HII_TIME RevocationTime; // The revocation time of the certificate\r

-  UINT8   FileEnrollType;      // File type of sigunature enroll\r
+  UINT8   FileEnrollType;      // File type of signature enroll\r

   UINT32  ListCount;           // The count of signature list.\r
   UINT32  CheckedDataCount;    // The count of checked signature data.\r
 } SECUREBOOT_CONFIGURATION;\r
   UINT32  ListCount;           // The count of signature list.\r
   UINT32  CheckedDataCount;    // The count of checked signature data.\r
 } SECUREBOOT_CONFIGURATION;\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
index a412d5bfe97ead6a39fac1e73a8aa7ec47e855e2..ac783453cc88a94a8c7e088f0258135f7d4e2747 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
@@ -45,8 +45,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #string STR_DBX_PE_IMAGE_FORMAT_HELP       #language en-US "PE image enrolled. Use SHA256 hash to enroll it into DBX"\r
 #string STR_DBX_PE_FORMAT_SHA256           #language en-US "PE Image SHA256"\r
 \r
 #string STR_DBX_PE_IMAGE_FORMAT_HELP       #language en-US "PE image enrolled. Use SHA256 hash to enroll it into DBX"\r
 #string STR_DBX_PE_FORMAT_SHA256           #language en-US "PE Image SHA256"\r
 \r

-#string STR_DBX_AUTH_2_FORMAT_HELP         #language en-US "VARIABLE_AUTHENICATION_2 binary enrolled. Use raw binary to enroll it into DBX"\r
-#string STR_DBX_AUTH_2_FORMAT              #language en-US "VARIABLE_AUTHENICATION_2"\r
+#string STR_DBX_AUTH_2_FORMAT_HELP         #language en-US "VARIABLE_AUTHENTICATION_2 binary enrolled. Use raw binary to enroll it into DBX"\r
+#string STR_DBX_AUTH_2_FORMAT              #language en-US "VARIABLE_AUTHENTICATION_2"\r

 \r
 #string STR_CERTIFICATE_REVOCATION_TIME_PROMPT #language en-US "  Revocation Time"\r
 #string STR_CERTIFICATE_REVOCATION_TIME_HELP   #language en-US "Input the revocation time of the certificate"\r
 \r
 #string STR_CERTIFICATE_REVOCATION_TIME_PROMPT #language en-US "  Revocation Time"\r
 #string STR_CERTIFICATE_REVOCATION_TIME_HELP   #language en-US "Input the revocation time of the certificate"\r