From: Sean Brogan <sean.bro...@microsoft.com>

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

Cc: Jiewen Yao <jiewen....@intel.com>
Cc: Jian J Wang <jian.j.w...@intel.com>
Cc: Chao Zhang <chao.b.zh...@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
---
 SecurityPkg/FvReportPei/FvReportPei.c         |  4 ++--
 SecurityPkg/Hash2DxeCrypto/Driver.c           |  6 ++---
 SecurityPkg/Hash2DxeCrypto/Driver.h           |  4 ++--
 SecurityPkg/HddPassword/HddPasswordDxe.c      | 10 ++++----
 SecurityPkg/HddPassword/HddPasswordDxe.h      |  2 +-
 .../HddPassword/HddPasswordStrings.uni        |  2 +-
 .../Guid/AuthenticatedVariableFormat.h        |  2 +-
 .../Include/Library/Tcg2PhysicalPresenceLib.h |  4 ++--
 .../Include/Library/TcgStorageCoreLib.h       | 12 +++++-----
 SecurityPkg/Include/Library/Tpm2CommandLib.h  |  2 +-
 SecurityPkg/Include/Library/TpmCommLib.h      |  2 +-
 .../Ppi/FirmwareVolumeInfoPrehashedFV.h       |  4 ++--
 .../Library/AuthVariableLib/AuthService.c     |  4 ++--
 .../AuthVariableLib/AuthServiceInternal.h     |  2 +-
 .../Library/AuthVariableLib/AuthVariableLib.c |  4 ++--
 .../DxeImageAuthenticationStatusLib.c         |  2 +-
 .../DxeImageVerificationLib.c                 | 10 ++++----
 .../DxeRsa2048Sha256GuidedSectionExtractLib.c |  4 ++--
 ...xeRsa2048Sha256GuidedSectionExtractLib.inf |  2 +-
 ...xeRsa2048Sha256GuidedSectionExtractLib.uni |  2 +-
 .../DxeTpm2MeasureBootLib.c                   |  4 ++--
 .../DxeTpmMeasureBootLib.c                    |  4 ++--
 .../DxeTpmMeasurementLib.c                    |  2 +-
 .../HashInstanceLibSha1/HashInstanceLibSha1.c |  2 +-
 .../HashInstanceLibSha256.c                   |  2 +-
 .../HashInstanceLibSha384.c                   |  2 +-
 .../HashInstanceLibSha512.c                   |  2 +-
 SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c |  2 +-
 .../PeiRsa2048Sha256GuidedSectionExtractLib.c |  4 ++--
 ...eiRsa2048Sha256GuidedSectionExtractLib.inf |  2 +-
 ...eiRsa2048Sha256GuidedSectionExtractLib.uni |  2 +-
 .../TcgStorageCoreLib/TcgStorageCore.c        | 10 ++++----
 .../TcgStorageCoreLib/TcgStorageUtil.c        |  2 +-
 .../TcgStorageOpalLib/TcgStorageOpalUtil.c    |  6 ++---
 .../Library/Tpm12CommandLib/Tpm12NvStorage.c  |  2 +-
 .../Library/Tpm12DeviceLibDTpm/Tpm12Tis.c     |  2 +-
 .../Library/Tpm2CommandLib/Tpm2Capability.c   |  4 ++--
 .../Library/Tpm2CommandLib/Tpm2Hierarchy.c    |  2 +-
 .../Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c     |  2 +-
 .../Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c   |  2 +-
 .../Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c       |  4 ++--
 .../Library/Tpm2DeviceLibDTpm/Tpm2Tis.c       |  4 ++--
 SecurityPkg/Library/TpmCommLib/CommonHeader.h |  2 +-
 SecurityPkg/Library/TpmCommLib/TisPc.c        |  2 +-
 .../Pkcs7VerifyDxe/Pkcs7VerifyDxe.c           | 18 +++++++-------
 .../RandomNumberGenerator/RngDxe/RdRand.c     |  2 +-
 SecurityPkg/SecurityPkg.dec                   | 18 +++++++-------
 SecurityPkg/SecurityPkg.dsc                   |  2 +-
 SecurityPkg/SecurityPkg.uni                   | 12 +++++-----
 .../Tcg/MemoryOverwriteControl/TcgMor.c       |  6 ++---
 .../Tcg/MemoryOverwriteControl/TcgMor.inf     |  2 +-
 .../Tcg/MemoryOverwriteControl/TcgMor.uni     |  2 +-
 .../TcgMorLock.c                              |  4 ++--
 .../TcgMorLock.h                              |  2 +-
 .../TcgMorLock.uni                            |  4 ++--
 .../TcgMorLockSmm.inf                         |  2 +-
 .../Tcg/Opal/OpalPassword/OpalDriver.c        |  6 ++---
 .../Tcg/Opal/OpalPassword/OpalDriver.h        |  6 ++---
 SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c   | 10 ++++----
 SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h   |  8 +++----
 .../PhysicalPresencePei/PhysicalPresencePei.c |  2 +-
 SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr     |  6 ++---
 SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c |  2 +-
 SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c   |  4 ++--
 SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c   |  2 +-
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c             |  2 +-
 SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c             | 16 ++++++-------
 SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c             | 22 ++++++++---------
 SecurityPkg/Tcg/Tcg2Smm/Tpm.asl               |  6 ++---
 .../Tcg/TcgConfigDxe/TcgConfigDriver.c        |  2 +-
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c               |  6 ++---
 SecurityPkg/Tcg/TcgPei/TcgPei.c               | 18 +++++++-------
 SecurityPkg/Tcg/TcgSmm/Tpm.asl                |  6 ++---
 .../SecureBootConfigDriver.c                  |  2 +-
 .../SecureBootConfigDxe.inf                   |  2 +-
 .../SecureBootConfigDxe.uni                   |  2 +-
 .../SecureBootConfigImpl.c                    | 24 +++++++++----------
 .../SecureBootConfigImpl.h                    | 10 ++++----
 .../SecureBootConfigMisc.c                    |  8 +++----
 .../SecureBootConfigNvData.h                  |  4 ++--
 .../SecureBootConfigStrings.uni               |  4 ++--
 81 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/SecurityPkg/FvReportPei/FvReportPei.c 
b/SecurityPkg/FvReportPei/FvReportPei.c
index d24470af6b..d709760ea3 100644
--- a/SecurityPkg/FvReportPei/FvReportPei.c
+++ b/SecurityPkg/FvReportPei/FvReportPei.c
@@ -145,7 +145,7 @@ VerifyHashedFv (
   ASSERT (HashValue != NULL);
 
   //
-  // Calcuate hash value for each FV first.
+  // Calculate hash value for each FV first.
   //
   FvHashValue = HashValue;
   for (FvIndex = 0; FvIndex < FvNumber; ++FvIndex) {
@@ -281,7 +281,7 @@ ReportHashedFv (
   @param[in] StoredHashFvPpi  Pointer to PPI containing hash information.
   @param[in] BootMode         Current boot mode.
 
-  @retval Pointer to structure containning valid hash information for current 
boot mode.
+  @retval Pointer to structure containing valid hash information for current 
boot mode.
   @retval NULL if there's no hash associated with current boot mode.
 **/
 STATIC
diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.c 
b/SecurityPkg/Hash2DxeCrypto/Driver.c
index 6aa88f8b3b..4627061a28 100644
--- 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
                                      to the existing child handle.
 
-  @retval EFI_SUCCES                 The protocol was added to ChildHandle.
+  @retval EFI_SUCCESS                The protocol was added to ChildHandle.
   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available 
to
                                      create the child.
@@ -99,7 +99,7 @@ Hash2ServiceBindingCreateChild (
                                  instance.
   @param[in]  ChildHandle        Handle of the child to destroy.
 
-  @retval EFI_SUCCES             The protocol was removed from ChildHandle.
+  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that
                                  is being removed.
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.
@@ -193,7 +193,7 @@ Hash2ServiceBindingDestroyChild (
   @param[in]  ImageHandle  The image handle of the driver.
   @param[in]  SystemTable  The system table.
 
-  @retval EFI_SUCCES       The service binding protocols is successfully 
installed.
+  @retval EFI_SUCCESS      The service binding protocols is successfully 
installed.
   @retval Others           Other errors as indicated.
 
 **/
diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.h 
b/SecurityPkg/Hash2DxeCrypto/Driver.h
index 162279e469..7b8996912a 100644
--- 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
                                      to the existing child handle.
 
-  @retval EFI_SUCCES                 The protocol was added to ChildHandle.
+  @retval EFI_SUCCESS                The protocol was added to ChildHandle.
   @retval EFI_INVALID_PARAMETER      ChildHandle is NULL.
   @retval EFI_OUT_OF_RESOURCES       There are not enough resources available 
to
                                      create the child.
@@ -104,7 +104,7 @@ Hash2ServiceBindingCreateChild (
                                  instance.
   @param[in]  ChildHandle        Handle of the child to destroy.
 
-  @retval EFI_SUCCES             The protocol was removed from ChildHandle.
+  @retval EFI_SUCCESS            The protocol was removed from ChildHandle.
   @retval EFI_UNSUPPORTED        ChildHandle does not support the protocol that
                                  is being removed.
   @retval EFI_INVALID_PARAMETER  ChildHandle is NULL.
diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c 
b/SecurityPkg/HddPassword/HddPasswordDxe.c
index 051e64091d..a25b3471d0 100644
--- a/SecurityPkg/HddPassword/HddPasswordDxe.c
+++ b/SecurityPkg/HddPassword/HddPasswordDxe.c
@@ -120,7 +120,7 @@ BuildHddPasswordDeviceInfo (
 
     //
     // 1. Handle device which already set password.
-    // 2. When request to send freeze comamnd, driver also needs to handle 
device
+    // 2. When request to send freeze command, driver also needs to handle 
device
     //    which support security feature.
     //
     if ((!PasswordIsFullZero (ConfigFormEntry->Password)) ||
@@ -2008,9 +2008,9 @@ SaveHddPasswordRequest (
 }
 
 /**
-  Get the HDD Password configuration form entry by the index of the goto 
opcode actived.
+  Get the HDD Password configuration form entry by the index of the goto 
opcode activated.
 
-  @param[in]  Index The 0-based index of the goto opcode actived.
+  @param[in]  Index The 0-based index of the goto opcode activated.
 
   @return The HDD Password configuration form entry found.
 **/
@@ -2758,7 +2758,7 @@ HddPasswordConfigFormInit (
   @param ImageHandle     Image handle this driver.
   @param SystemTable     Pointer to SystemTable.
 
-  @retval EFI_SUCESS     This function always complete successfully.
+  @retval EFI_SUCCESS     This function always complete successfully.
 
 **/
 EFI_STATUS
@@ -2806,7 +2806,7 @@ HddPasswordDxeInit (
   ASSERT_EFI_ERROR (Status);
 
   //
-  // Make HDD_PASSWORD_VARIABLE_NAME varible read-only.
+  // Make HDD_PASSWORD_VARIABLE_NAME variable read-only.
   //
   Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID 
**) &VariableLock);
   if (!EFI_ERROR (Status)) {
diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.h 
b/SecurityPkg/HddPassword/HddPasswordDxe.h
index f695ca9454..87db587eb6 100644
--- 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)
 
 //
-//Iterate through the doule linked list. NOT delete safe
+//Iterate through the double linked list. NOT delete safe
 //
 #define EFI_LIST_FOR_EACH(Entry, ListHead)    \
   for (Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = 
Entry->ForwardLink)
diff --git a/SecurityPkg/HddPassword/HddPasswordStrings.uni 
b/SecurityPkg/HddPassword/HddPasswordStrings.uni
index 188c40f349..b6fddffced 100644
--- 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"
 #string STR_SECURITY_HDD_BANNER_TWO           #language en-US "Master 
Passwords."
 #string STR_SECURITY_HDD_BANNER_THREE         #language en-US "User Password 
need to be installed for Enabling Security."
-#string STR_SECURITY_HDD_BANNER_FOUR          #language en-US "Master Password 
can be modified only when succesfully"
+#string STR_SECURITY_HDD_BANNER_FOUR          #language en-US "Master Password 
can be modified only when successfully"
 #string STR_SECURITY_HDD_BANNER_FIVE          #language en-US "unlocked with 
User Password in POST."
 
 #string STR_HDD_SECURITY_HD                   #language en-US "HDD Password"
diff --git a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h 
b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
index 2a097826a0..44ceebc488 100644
--- a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
+++ b/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
@@ -54,7 +54,7 @@ extern EFI_GUID gEfiVendorKeysNvGuid;
 
 ///
 ///  "VendorKeysNv" variable to record the out of band secure boot keys 
modification.
-///  This variable is a read-only NV varaible that indicates whether someone 
other than
+///  This variable is a read-only NV variable that indicates whether someone 
other than
 ///  the platform vendor has used a mechanism not defined by the UEFI 
Specification to
 ///  transition the system to setup mode or to update secure boot keys.
 ///
diff --git a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h 
b/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
index 8da3deaf86..39febcb655 100644
--- a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
+++ b/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
@@ -29,8 +29,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // UEFI TCG2 library definition bit of the BIOS Information Flags
 //
-#define TCG2_BIOS_INFORMATION_FLAG_HIERACHY_CONTROL_STORAGE_DISABLE      BIT8
-#define TCG2_BIOS_INFORMATION_FLAG_HIERACHY_CONTROL_ENDORSEMENT_DISABLE  BIT9
+#define TCG2_BIOS_INFORMATION_FLAG_HIERARCHY_CONTROL_STORAGE_DISABLE      BIT8
+#define TCG2_BIOS_INFORMATION_FLAG_HIERARCHY_CONTROL_ENDORSEMENT_DISABLE  BIT9
 
 //
 // UEFI TCG2 library definition bit of the BIOS Storage Management Flags
diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h 
b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
index 190065b63e..c25a56a14c 100644
--- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
+++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
@@ -696,7 +696,7 @@ TcgGetTokenUINT64(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -713,7 +713,7 @@ TcgGetNextUINT8(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -729,7 +729,7 @@ TcgGetNextUINT16(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -745,7 +745,7 @@ TcgGetNextUINT32(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -761,7 +761,7 @@ TcgGetNextUINT64(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -1261,7 +1261,7 @@ TcgEnumLevel0Discovery(
   Get Feature code from the header.
 
   @param     DiscoveryHeader    The discovery header.
-  @param     FeatureCode        reutrn the Feature code.
+  @param     FeatureCode        return the Feature code.
   @param     FeatureSize        return the Feature size.
 
   @retval    return the Feature code data.
diff --git a/SecurityPkg/Include/Library/Tpm2CommandLib.h 
b/SecurityPkg/Include/Library/Tpm2CommandLib.h
index d78d5ee1ba..ce381e786b 100644
--- a/SecurityPkg/Include/Library/Tpm2CommandLib.h
+++ b/SecurityPkg/Include/Library/Tpm2CommandLib.h
@@ -585,7 +585,7 @@ Tpm2PcrAllocateBanks (
   NOTE:
   To simplify this function, leave returned CapabilityData for caller to 
unpack since there are
   many capability categories and only few categories will be used in firmware. 
It means the caller
-  need swap the byte order for the feilds in CapabilityData.
+  need swap the byte order for the fields in CapabilityData.
 
   @param[in]  Capability         Group selection; determines the format of the 
response.
   @param[in]  Property           Further definition of information.
diff --git a/SecurityPkg/Include/Library/TpmCommLib.h 
b/SecurityPkg/Include/Library/TpmCommLib.h
index b9aca60b82..7e102a6a11 100644
--- 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.
 
   @param[in]  TisReg                Pointer to TIS register.
-  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstConut.
+  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstCount.
 
   @retval     EFI_SUCCESS           Get BurstCount.
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.
diff --git a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h 
b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
index 2fc95537dc..1b7320e916 100644
--- a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
+++ b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
@@ -26,10 +26,10 @@ typedef struct _HASH_INFO {
 //
 // This PPI carries prehashsed data for one FV.  Platform should ensure 1:1 
mapping between pre-hashed PPI and corresponding FV.
 // 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.
-// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with each 
pre-hased PPIs
+// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with each 
pre-hashed PPIs
 //   For each pre-hashed PPI
 //     If PPI carries hash generated by equivalent or larger algorithm set 
than TPM required, directly use PPI
-//     else, drops PPI data and cacluate all hash again
+//     else, drops PPI data and calculate all hash again
 //
 typedef struct {
   UINT32                                     FvBase;
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthService.c 
b/SecurityPkg/Library/AuthVariableLib/AuthService.c
index 486df55bed..2f60331f2c 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthService.c
+++ b/SecurityPkg/Library/AuthVariableLib/AuthService.c
@@ -425,7 +425,7 @@ CheckSignatureListFormat(
   RsaContext = NULL;
 
   //
-  // Walk throuth the input signature list and check the data format.
+  // Walk through the input signature list and check the data format.
   // If any signature is incorrectly formed, the whole check will fail.
   //
   while ((SigDataSize > 0) && (SigDataSize >= SigList->SignatureListSize)) {
@@ -1069,7 +1069,7 @@ AuthServiceInternalCompareTimeStamp (
   @param[out] Sha256Digest       Sha256 digest calculated.
 
   @return EFI_ABORTED          Digest process failed.
-  @return EFI_SUCCESS          SHA256 Digest is succesfully calculated.
+  @return EFI_SUCCESS          SHA256 Digest is successfully calculated.
 
 **/
 EFI_STATUS
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h 
b/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
index da2c40bc37..2bec637f75 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
+++ b/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
@@ -159,7 +159,7 @@ DeleteCertsFromDb (
 /**
   Clean up signer's certificates for common authenticated variable
   by corresponding VariableName and VendorGuid from "certdb".
-  Sytem may break down during Timebased Variable update & certdb update,
+  System may break down during Timebased Variable update & certdb update,
   make them inconsistent,  this function is called in AuthVariable Init to 
ensure
   consistency
 
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c 
b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
index e80fadbf05..122b3b0bf4 100644
--- 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;
 
 /**
-  Initialization for authenticated varibale services.
+  Initialization for authenticated variable services.
   If this initialization returns error status, other APIs will not work
   and expect to be not called then.
 
@@ -382,7 +382,7 @@ AuthVariableLibInitialize (
   @retval EFI_INVALID_PARAMETER     Invalid parameter.
   @retval EFI_WRITE_PROTECTED       Variable is write-protected.
   @retval EFI_OUT_OF_RESOURCES      There is not enough resource.
-  @retval EFI_SECURITY_VIOLATION    The variable is with 
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS
+  @retval EFI_SECURITY_VIOLATION    The variable is with 
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS
                                     set, but the AuthInfo does NOT pass the 
validation
                                     check carried out by the firmware.
   @retval EFI_UNSUPPORTED           Unsupported to process authenticated 
variable.
diff --git 
a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
 
b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
index 38448f0c8c..e4ddff21b5 100644
--- 
a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
+++ 
b/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
@@ -49,7 +49,7 @@ DxeImageAuthenticationStatusHandler (
 
 
 /**
-  Register image authenticaion status check handler.
+  Register image authentication status check handler.
 
   @param  ImageHandle   ImageHandle of the loaded driver.
   @param  SystemTable   Pointer to the EFI System Table.
diff --git 
a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c 
b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index fe4cdccedd..a0a12b50dd 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -745,7 +745,7 @@ AddImageExeInfo (
   if (ImageExeInfoTable != NULL) {
     //
     // The table has been found!
-    // We must enlarge the table to accomodate the new exe info entry.
+    // We must enlarge the table to accommodate the new exe info entry.
     //
     ImageExeInfoTableSize = GetImageExeInfoTableSize (ImageExeInfoTable);
   } else {
@@ -947,7 +947,7 @@ Done:
 
   @param[in]  VariableName        Name of database variable that is searched 
in.
   @param[in]  Signature           Pointer to signature that is searched for.
-  @param[in]  CertType            Pointer to hash algrithom.
+  @param[in]  CertType            Pointer to hash algorithm.
   @param[in]  SignatureSize       Size of Signature.
 
   @return TRUE                    Found the signature in the variable database.
@@ -992,7 +992,7 @@ IsSignatureFoundInDatabase (
     goto Done;
   }
   //
-  // Enumerate all signature data in SigDB to check if executable's signature 
exists.
+  // Enumerate all signature data in SigDB to check if signature exists for 
executable.
   //
   CertList = (EFI_SIGNATURE_LIST *) Data;
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {
@@ -1844,7 +1844,7 @@ DxeImageVerificationHandler (
 
   if (OffSet != (SecDataDir->VirtualAddress + SecDataDir->Size)) {
     //
-    // The Size in Certificate Table or the attribute certicate table is 
corrupted.
+    // The Size in Certificate Table or the attribute certificate table is 
corrupted.
     //
     VerifyStatus = EFI_ACCESS_DENIED;
   }
@@ -1855,7 +1855,7 @@ DxeImageVerificationHandler (
     Status = EFI_ACCESS_DENIED;
     if (Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED || Action == 
EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND) {
       //
-      // Get image hash value as executable's signature.
+      // Get image hash value as signature of executable.
       //
       SignatureListSize = sizeof (EFI_SIGNATURE_LIST) + sizeof 
(EFI_SIGNATURE_DATA) - 1 + mImageDigestSize;
       SignatureList     = (EFI_SIGNATURE_LIST *) AllocateZeroPool 
(SignatureListSize);
diff --git 
a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
 
b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
index 0059328950..28807d4d98 100644
--- 
a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
+++ 
b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
@@ -2,7 +2,7 @@
 
   This library registers RSA 2048 SHA 256 guided section handler
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.
-  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -213,7 +213,7 @@ Rsa2048Sha256GuidedSectionHandler (
   }
 
   //
-  // All paths from here return EFI_SUCESS and result is returned in 
AuthenticationStatus
+  // All paths from here return EFI_SUCCESS and result is returned in 
AuthenticationStatus
   //
   Status = EFI_SUCCESS;
 
diff --git 
a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
 
b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
index 0822fd0856..9c426edace 100644
--- 
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
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.
 #
-#  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+#  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 #
 # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 #
diff --git 
a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
 
b/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
index 484bde0afc..f0294a68f5 100644
--- 
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
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.
 //
-// It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+// It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 //
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 //
diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c 
b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
index 543635b2e4..04b9b0d7fb 100644
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
@@ -362,7 +362,7 @@ Tcg2MeasurePeImage (
   if (Status == EFI_VOLUME_FULL) {
     //
     // Volume full here means the image is hashed and its result is extended 
to PCR.
-    // But the event log cann't be saved since log area is full.
+    // But the event log can't be saved since log area is full.
     // Just return EFI_SUCCESS in order not to block the image load.
     //
     Status = EFI_SUCCESS;
@@ -541,7 +541,7 @@ DxeTpm2MeasureBootHandler (
     }
     //
     // The PE image from unmeasured Firmware volume need be measured
-    // The PE image from measured Firmware volume will be mearsured according 
to policy below.
+    // The PE image from measured Firmware volume will be measured according 
to policy below.
     //   If it is driver, do not measure
     //   If it is application, still measure.
     //
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c 
b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index a2d3923ca6..1f2eed29a1 100644
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
@@ -649,7 +649,7 @@ TcgMeasurePeImage (
   if (Status == EFI_OUT_OF_RESOURCES) {
     //
     // Out of resource here means the image is hashed and its result is 
extended to PCR.
-    // But the event log cann't be saved since log area is full.
+    // But the event log can't be saved since log area is full.
     // Just return EFI_SUCCESS in order not to block the image load.
     //
     Status = EFI_SUCCESS;
@@ -838,7 +838,7 @@ DxeTpmMeasureBootHandler (
     }
     //
     // The PE image from unmeasured Firmware volume need be measured
-    // The PE image from measured Firmware volume will be mearsured according 
to policy below.
+    // The PE image from measured Firmware volume will be measured according 
to policy below.
     //   If it is driver, do not measure
     //   If it is application, still measure.
     //
diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c 
b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
index adf03bb226..061136ee78 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
@@ -56,7 +56,7 @@ Tpm12MeasureAndLogData (
   TcgEvent = NULL;
 
   //
-  // Tpm active/deactive state is checked in HashLogExtendEvent
+  // Tpm activation state is checked in HashLogExtendEvent
   //
   Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) 
&TcgProtocol);
   if (EFI_ERROR(Status)){
diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c 
b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
index 9ca784a873..52521b6444 100644
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
+++ b/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha1InternalHashInstance = {
 /**
   The function register SHA1 instance.
 
-  @retval EFI_SUCCESS   SHA1 instance is registered, or system dose not 
surpport registr SHA1 instance
+  @retval EFI_SUCCESS   SHA1 instance is registered, or system does not 
support register SHA1 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c 
b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
index 01fce3fd2b..760e20bae0 100644
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
+++ b/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha256InternalHashInstance = {
 /**
   The function register SHA256 instance.
 
-  @retval EFI_SUCCESS   SHA256 instance is registered, or system dose not 
surpport registr SHA256 instance
+  @retval EFI_SUCCESS   SHA256 instance is registered, or system does not 
support register SHA256 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c 
b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
index 29f6c8a828..99e2416a8e 100644
--- a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
+++ b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.c
@@ -128,7 +128,7 @@ HASH_INTERFACE  mSha384InternalHashInstance = {
 /**
   The function register SHA384 instance.
 
-  @retval EFI_SUCCESS   SHA384 instance is registered, or system dose not 
surpport registr SHA384 instance
+  @retval EFI_SUCCESS   SHA384 instance is registered, or system does not 
support register SHA384 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c 
b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
index d5389e1e22..b047791e02 100644
--- a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
+++ b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.c
@@ -127,7 +127,7 @@ HASH_INTERFACE  mSha512InternalHashInstance = {
 /**
   The function register SHA512 instance.
 
-  @retval EFI_SUCCESS   SHA512 instance is registered, or system dose not 
surpport registr SHA512 instance
+  @retval EFI_SUCCESS   SHA512 instance is registered, or system does not 
support register SHA512 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c 
b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
index f6819793ab..bd24958505 100644
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
+++ b/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
@@ -29,7 +29,7 @@ TPM2_HASH_MASK mTpm2HashMask[] = {
 };
 
 /**
-  The function get algorith from hash mask info.
+  The function get algorithm from hash mask info.
 
   @return Hash algorithm
 **/
diff --git 
a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
 
b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
index df16715120..a759183d20 100644
--- 
a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
+++ 
b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
@@ -2,7 +2,7 @@
 
   This library registers RSA 2048 SHA 256 guided section handler
   to parse RSA 2048 SHA 256 encapsulation section and extract raw data.
-  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -197,7 +197,7 @@ Rsa2048Sha256GuidedSectionHandler (
   }
 
   //
-  // All paths from here return EFI_SUCESS and result is returned in 
AuthenticationStatus
+  // All paths from here return EFI_SUCCESS and result is returned in 
AuthenticationStatus
   //
   Status = EFI_SUCCESS;
 
diff --git 
a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
 
b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
index 3fd5e52430..dac97a050e 100644
--- 
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
 #  that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.
 #
-#  It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+#  It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 #
 # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 #
diff --git 
a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
 
b/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
index 484bde0afc..f0294a68f5 100644
--- 
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
 // that parses RSA 2048 SHA 256 encapsulation section and extracts raw data.
 //
-// It uses the BaseCrypyLib based on OpenSSL to authenticate the signature.
+// It uses the BaseCryptLib based on OpenSSL to authenticate the signature.
 //
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
 //
diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c 
b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
index 1c072fac23..f9c57a13f2 100644
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
+++ b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
@@ -1249,7 +1249,7 @@ TcgGetTokenByteSequence(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -1282,7 +1282,7 @@ TcgGetNextUINT8(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -1315,7 +1315,7 @@ TcgGetNextUINT16(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -1348,7 +1348,7 @@ TcgGetNextUINT32(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
@@ -1370,7 +1370,7 @@ TcgGetNextUINT64(
   Get next specify value.
 
   @param    ParseStruct   Input parse structure.
-  @param    Value         Return vlaue.
+  @param    Value         Return value.
 
   @retval   return the action result.
 
diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c 
b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
index d06ad62c91..b6d5cf9890 100644
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
+++ b/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
@@ -810,7 +810,7 @@ TcgFindFeatureCallback(
   Get Feature code from the header.
 
   @param     DiscoveryHeader    The discovery header.
-  @param     FeatureCode        reutrn the Feature code.
+  @param     FeatureCode        return the Feature code.
   @param     FeatureSize        return the Feature size.
 
   @retval    return the Feature code data.
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c 
b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index bc52cceabd..b4927a0872 100644
--- 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>
 #include "TcgStorageOpalLibInternal.h"
 
-#define OPAL_MSID_LENGHT        128
+#define OPAL_MSID_LENGTH        128
 
 /**
   Creates a session with OPAL_UID_ADMIN_SP as OPAL_ADMIN_SP_PSID_AUTHORITY, 
then reverts device using Admin SP Revert method.
@@ -1095,7 +1095,7 @@ GetRevertTimeOut (
   OPAL_DISK_SUPPORT_ATTRIBUTE  SupportedAttributes;
   UINT16                       BaseComId;
   UINT32                       MsidLength;
-  UINT8                        Msid[OPAL_MSID_LENGHT];
+  UINT8                        Msid[OPAL_MSID_LENGTH];
   UINT32                       RemovalMechanishLists[ResearvedMechanism];
   UINT8                        ActiveDataRemovalMechanism;
 
@@ -1104,7 +1104,7 @@ GetRevertTimeOut (
     return 0;
   }
 
-  TcgResult = OpalUtilGetMsid (Session, Msid, OPAL_MSID_LENGHT, &MsidLength);
+  TcgResult = OpalUtilGetMsid (Session, Msid, OPAL_MSID_LENGTH, &MsidLength);
   if (TcgResult != TcgResultSuccess) {
     return 0;
   }
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c 
b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
index 609186fb7c..8295a1d267 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
+++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
@@ -218,7 +218,7 @@ Tpm12NvWriteValue (
   if (EFI_ERROR (Status)) {
     return Status;
   }
-  DEBUG ((DEBUG_INFO, "Tpm12NvWritedValue - ReturnCode = %x\n", SwapBytes32 
(Response.returnCode)));
+  DEBUG ((DEBUG_INFO, "Tpm12NvWriteValue - ReturnCode = %x\n", SwapBytes32 
(Response.returnCode)));
   switch (SwapBytes32 (Response.returnCode)) {
   case TPM_SUCCESS:
     return EFI_SUCCESS;
diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c 
b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
index 9c5b3d5740..1caa076203 100644
--- 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.
 
   @param[in]  TisReg                Pointer to TIS register.
-  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstConut.
+  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstCount.
 
   @retval     EFI_SUCCESS           Get BurstCount.
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c 
b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
index 4e9f030e77..85b11c7715 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
@@ -53,7 +53,7 @@ typedef struct {
   NOTE:
   To simplify this function, leave returned CapabilityData for caller to 
unpack since there are
   many capability categories and only few categories will be used in firmware. 
It means the caller
-  need swap the byte order for the feilds in CapabilityData.
+  need swap the byte order for the fields in CapabilityData.
 
   @param[in]  Capability         Group selection; determines the format of the 
response.
   @param[in]  Property           Further definition of information.
@@ -119,7 +119,7 @@ Tpm2GetCapability (
   //
   *MoreData = RecvBuffer.MoreData;
   //
-  // Does not unpack all possiable property here, the caller should unpack it 
and note the byte order.
+  // Does not unpack all possible property here, the caller should unpack it 
and note the byte order.
   //
   CopyMem (CapabilityData, &RecvBuffer.CapabilityData, RecvBufferSize - sizeof 
(TPM2_RESPONSE_HEADER) - sizeof (UINT8));
 
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c 
b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
index 8e05596763..dc36963c0e 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
@@ -435,7 +435,7 @@ Tpm2HierarchyChangeAuth (
   WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(NewAuth->size));
   Buffer += sizeof(UINT16);
 
-  // New Authorizeation
+  // New Authorization
   CopyMem(Buffer, NewAuth->buffer, NewAuth->size);
   Buffer += NewAuth->size;
 
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c 
b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
index 53b9bc42fb..42e1ecbce9 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
@@ -137,7 +137,7 @@ Tpm2RegisterTpm2DeviceLib (
 /**
   The function caches current active TPM interface type.
 
-  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system dose not 
surpport registr DTPM2.0 instance
+  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system does not 
support register DTPM2.0 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c 
b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
index 435cbf6298..691eaa40c0 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
@@ -93,7 +93,7 @@ TPM2_DEVICE_INTERFACE  mDTpm2InternalTpm2Device = {
 /**
   The function register DTPM2.0 instance and caches current active TPM 
interface type.
 
-  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system dose not 
surpport registr DTPM2.0 instance
+  @retval EFI_SUCCESS   DTPM2.0 instance is registered, or system does not 
support register DTPM2.0 instance
 **/
 EFI_STATUS
 EFIAPI
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c 
b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
index 8596143b53..b671cef04e 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
@@ -327,7 +327,7 @@ PtpCrbTpmCommand (
 
 GoReady_Exit:
   //
-  // Goto Ready State if command is completed succesfully and TPM support 
IdleBypass
+  // Goto Ready State if command is completed successfully and TPM support 
IdleBypass
   // If not supported. flow down to GoIdle
   //
   if (PcdGet8(PcdCRBIdleByPass) == 1) {
@@ -347,7 +347,7 @@ GoIdle_Exit:
   MmioWrite32((UINTN)&CrbReg->CrbControlRequest, 
PTP_CRB_CONTROL_AREA_REQUEST_GO_IDLE);
 
   //
-  // Only enforce Idle state transition if execution fails when 
CRBIndleBypass==1
+  // Only enforce Idle state transition if execution fails when 
CRBIdleBypass==1
   // Leave regular Idle delay at the beginning of next command execution
   //
   if (PcdGet8(PcdCRBIdleByPass) == 1){
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c 
b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
index d2ce8d1f09..bbebc94b4d 100644
--- 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.
 
   @param[in]  TisReg                Pointer to TIS register.
-  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstConut.
+  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstCount.
 
   @retval     EFI_SUCCESS           Get BurstCount.
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.
@@ -303,7 +303,7 @@ Tpm2TisTpmCommand (
                TIS_TIMEOUT_B
                );
     //
-    // Do not clear CANCEL bit here bicoz Writes of 0 to this bit are ignored
+    // Do not clear CANCEL bit here because Writes of 0 to this bit are ignored
     //
     if (EFI_ERROR (Status)) {
       //
diff --git a/SecurityPkg/Library/TpmCommLib/CommonHeader.h 
b/SecurityPkg/Library/TpmCommLib/CommonHeader.h
index 386c9fab44..aa2e412a11 100644
--- a/SecurityPkg/Library/TpmCommLib/CommonHeader.h
+++ b/SecurityPkg/Library/TpmCommLib/CommonHeader.h
@@ -1,5 +1,5 @@
 /** @file
-  The intenal header file for TpmCommLib.
+  The internal header file for TpmCommLib.
 
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
diff --git a/SecurityPkg/Library/TpmCommLib/TisPc.c 
b/SecurityPkg/Library/TpmCommLib/TisPc.c
index 162e883d21..4a14a2bf81 100644
--- 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.
 
   @param[in]  TisReg                Pointer to TIS register.
-  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstConut.
+  @param[out] BurstCount            Pointer to a buffer to store the got 
BurstCount.
 
   @retval     EFI_SUCCESS           Get BurstCount.
   @retval     EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NULL.
diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c 
b/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
index a113df3718..a96862f937 100644
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
+++ b/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
@@ -494,7 +494,7 @@ IsValidTimestamp (
     TsaCertSize = SigList->SignatureSize - sizeof (EFI_GUID);
 
     //
-    // Each TSA Certificate will normally be in a seperate EFI_SIGNATURE_LIST
+    // Each TSA Certificate will normally be in a separate EFI_SIGNATURE_LIST
     // Leverage ImageTimestampVerify interface for Timestamp counterSignature 
Verification
     //
     if (ImageTimestampVerify (SignedData, SignedDataSize, TsaCert, 
TsaCertSize, &SigningTime)) {
@@ -514,7 +514,7 @@ IsValidTimestamp (
 /**
   Check whether the PKCS7 signedData is revoked by verifying with the revoked
   certificates database, and if the signedData is timestamped, the embedded 
timestamp
-  couterSignature will be checked with the supplied timestamp database.
+  counterSignature will be checked with the supplied timestamp database.
 
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded 
PKCS7
                               signature.
@@ -657,8 +657,8 @@ P7CheckRevocationByHash (
       Status = EFI_SUCCESS;
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, 
&RevocationTime)) {
         //
-        // Use EFI_NOT_READY to identify the P7Data is not reovked, because 
the timestamping
-        // occured prior to the time of certificate revocation.
+        // Use EFI_NOT_READY to identify the P7Data is not revoked, because 
the timestamping
+        // occurred prior to the time of certificate revocation.
         //
         Status = EFI_NOT_READY;
       }
@@ -679,7 +679,7 @@ _Exit:
 /**
   Check whether the PKCS7 signedData is revoked by verifying with the revoked
   certificates database, and if the signedData is timestamped, the embedded 
timestamp
-  couterSignature will be checked with the supplied timestamp database.
+  counterSignature will be checked with the supplied timestamp database.
 
   @param[in]  SignedData      Pointer to buffer containing ASN.1 DER-encoded 
PKCS7
                               signature.
@@ -822,8 +822,8 @@ P7CheckRevocation (
       Status = EFI_SUCCESS;
       if (IsValidTimestamp (SignedData, SignedDataSize, TimeStampDb, 
&RevocationTime)) {
         //
-        // Use EFI_NOT_READY to identify the P7Data is not reovked, because 
the timestamping
-        // occured prior to the time of certificate revocation.
+        // Use EFI_NOT_READY to identify the P7Data is not revoked, because 
the timestamping
+        // occurred prior to the time of certificate revocation.
         //
         Status = EFI_NOT_READY;
       }
@@ -1261,7 +1261,7 @@ VerifyBuffer (
                );
     if (!EFI_ERROR (Status)) {
       //
-      // The PKCS7 SignedData is reovked
+      // The PKCS7 SignedData is revoked
       //
       Status = EFI_SECURITY_VIOLATION;
       goto _Exit;
@@ -1413,7 +1413,7 @@ VerifySignature (
 
     if (!EFI_ERROR (Status)) {
       //
-      // The PKCS7 SignedData is reovked
+      // The PKCS7 SignedData is revoked
       //
       return EFI_SECURITY_VIOLATION;
     }
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c 
b/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
index 59789533b0..e7dd5ab181 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
+++ b/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
@@ -79,7 +79,7 @@ RdRandGetSeed128 (
   UINT32      Index2;
 
   //
-  // Chose an arbitary key and zero the feed_forward_value (FFV)
+  // Chose an arbitrary key and zero the feed_forward_value (FFV)
   //
   for (Index = 0; Index < 16; Index++) {
     Key[Index] = (UINT8) Index;
diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 8249bf0220..cac36caf0a 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -68,11 +68,11 @@ [LibraryClasses]
   #
   Tcg2PhysicalPresenceLib|Include/Library/Tcg2PhysicalPresenceLib.h
 
-  ## @libraryclass  Provides interfaces about TCG storage generic commond.
+  ## @libraryclass  Provides interfaces about TCG storage generic command.
   #
   TcgStorageCoreLib|Include/Library/TcgStorageCoreLib.h
 
-  ## @libraryclass  Provides interfaces about TCG storage Opal generic commond.
+  ## @libraryclass  Provides interfaces about TCG storage Opal generic command.
   #
   TcgStorageOpalLib|Include/Library/TcgStorageOpalLib.h
 
@@ -369,9 +369,9 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, 
PcdsDynamicEx]
   # @Prompt TPM device address.
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0xFED40000|UINT64|0x00010012
 
-  ## This PCR means the OEM configurated number of PCR banks.
+  ## This PCR means the OEM configured number of PCR banks.
   #  0 means dynamic get from supported HASH algorithm
-  # @Prompt OEM configurated number of PCR banks.
+  # @Prompt OEM configured number of PCR banks.
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks|0x0|UINT32|0x00010015
 
   ## Provides one or more SHA 256 Hashes of the RSA 2048 public keys used to 
verify Recovery and Capsule Update images
@@ -469,7 +469,7 @@ [PcdsDynamic, PcdsDynamicEx]
   
gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0xFFFFFFFF|UINT32|0x00010016
 
   ## This PCD indicates current active TPM interface type.
-  #  Accodingt to TCG PTP spec 1.3, there are 3 types defined in 
TPM2_PTP_INTERFACE_TYPE.<BR>
+  #  According to TCG PTP spec 1.3, there are 3 types defined in 
TPM2_PTP_INTERFACE_TYPE.<BR>
   #  0x00 - FIFO interface as defined in TIS 1.3 is active.<BR>
   #  0x01 - FIFO interface as defined in PTP for TPM 2.0 is active.<BR>
   #  0x02 - CRB interface is active.<BR>
@@ -478,14 +478,14 @@ [PcdsDynamic, PcdsDynamicEx]
   # @Prompt current active TPM interface type.
   gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType|0xFF|UINT8|0x0001001E
 
-  ## This PCD records IdleByass status supported by current active TPM 
interface.
-  #  Accodingt to TCG PTP spec 1.3, TPM with CRB interface can skip idle state 
and
-  #  diretcly move to CmdReady state. <BR>
+  ## This PCD records IdleBypass status supported by current active TPM 
interface.
+  #  According to TCG PTP spec 1.3, TPM with CRB interface can skip idle state 
and
+  #  directly move to CmdReady state. <BR>
   #  0x00 - Do not support IdleByPass.<BR>
   #  0x01 - Support IdleByPass.<BR>
   #  0xFF - IdleByPass State is not synced with TPM hardware.<BR>
   #
-  # @Prompt IdleByass status supported by current active TPM interface.
+  # @Prompt IdleBypass status supported by current active TPM interface.
   gEfiSecurityPkgTokenSpaceGuid.PcdCRBIdleByPass|0xFF|UINT8|0x0001001F
 
   ## This PCD records LAML field in TPM2 ACPI table.
diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index aef2ac3a20..9a254087a3 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -70,7 +70,7 @@ [LibraryClasses]
 [LibraryClasses.ARM]
   #
   # It is not possible to prevent the ARM compiler for generic intrinsic 
functions.
-  # This library provides the instrinsic functions generate by a given 
compiler.
+  # This library provides the intrinsic functions generate by a given compiler.
   # And NULL mean link this library into all ARM images.
   #
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
diff --git a/SecurityPkg/SecurityPkg.uni b/SecurityPkg/SecurityPkg.uni
index ee79b98f0d..68587304d7 100644
--- a/SecurityPkg/SecurityPkg.uni
+++ b/SecurityPkg/SecurityPkg.uni
@@ -80,7 +80,7 @@
 
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTpmPhysicalPresence_PROMPT  
#language en-US "Physical presence of the platform operator."
 
-#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"
+#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"
                                                                                
        "TRUE  - The platform operator is physically present.<BR>\n"
                                                                                
        "FALSE - The platform operator is not physically present.<BR>"
 
@@ -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"
                                                                                
                 "WARNING: The default value is treated as test key. Please do 
not use default value in the production."
 
-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_PROMPT  
#language en-US "OEM configurated number of PCR banks."
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_PROMPT  
#language en-US "OEM configured number of PCR banks."
 
-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_HELP  
#language en-US "This PCR means the OEM configurated number of PCR banks.\n"
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2NumberOfPCRBanks_HELP  
#language en-US "This PCR means the OEM configured number of PCR banks.\n"
                                                                                
         "0 means dynamic get from supported HASH algorithm"
 
 #string STR_gEfiSecurityPkgTokenSpaceGuid_PcdTcg2HashAlgorithmBitmap_PROMPT  
#language en-US "Hash Algorithm bitmap."
@@ -256,10 +256,10 @@
                                                                                
           "0x02 - CRB interface is active.<BR>\n"
                                                                                
           "0xFF - Contains no current active TPM interface type<BR>"
 
-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_PROMPT  #language 
en-US "IdleByass status supported by current active TPM interface."
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_PROMPT  #language 
en-US "IdleBypass status supported by current active TPM interface."
 
-#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_HELP  #language 
en-US "This PCD records IdleByass status supported by current active TPM 
interface.\n"
-                                                                               
           "Accodingt to TCG PTP spec 1.3, TPM with CRB interface can skip idle 
state and diretcly move to CmdReady state. <BR>"
+#string STR_gEfiSecurityPkgTokenSpaceGuid_PcdCRBIdleByPass_HELP  #language 
en-US "This PCD records IdleBypass status supported by current active TPM 
interface.\n"
+                                                                               
           "According to TCG PTP spec 1.3, TPM with CRB interface can skip idle 
state and directly move to CmdReady state. <BR>"
                                                                                
           "0x01 - Do not support IdleByPass.<BR>\n"
                                                                                
           "0x02 - Support IdleByPass.<BR>\n"
                                                                                
           "0xFF - IdleByPass State is not synced with TPM hardware.<BR>"
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c 
b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
index afbecbc00d..97e819edf4 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
@@ -1,7 +1,7 @@
 /** @file
   TCG MOR (Memory Overwrite Request) Control Driver.
 
-  This driver initilize MemoryOverwriteRequestControl variable. It
+  This driver initialize MemoryOverwriteRequestControl variable. It
   will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also do TPer Reset 
for
   those encrypted drives through EFI_STORAGE_SECURITY_COMMAND_PROTOCOL at 
EndOfDxe.
 
@@ -298,7 +298,7 @@ TPerResetAtEndOfDxe (
   @param[in] ImageHandle  Image handle of this driver.
   @param[in] SystemTable  A Pointer to the EFI System Table.
 
-  @retval EFI_SUCEESS
+  @retval EFI_SUCCESS
   @return Others          Some error occurs.
 **/
 EFI_STATUS
@@ -341,7 +341,7 @@ MorDriverEntryPoint (
     //
     // Create a Ready To Boot Event and Clear the MorControl bit in the call 
back function.
     //
-    DEBUG ((DEBUG_INFO, "TcgMor: Create ReadyToBoot Event for MorControl Bit 
cleanning!\n"));
+    DEBUG ((DEBUG_INFO, "TcgMor: Create ReadyToBoot Event for MorControl Bit 
cleaning!\n"));
     Status = EfiCreateEventReadyToBootEx (
                TPL_CALLBACK,
                OnReadyToBoot,
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf 
b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index de624423a6..906bafa04a 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Initilizes MemoryOverwriteRequestControl variable
+#  initializes MemoryOverwriteRequestControl variable
 #
 #  This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set. It will also 
do
 #  TPer Reset for those encrypted drives through 
EFI_STORAGE_SECURITY_COMMAND_PROTOCOL
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni 
b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
index 0c499e7d1a..6a1df10394 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Initilizes MemoryOverwriteRequestControl variable
+// initializes MemoryOverwriteRequestControl variable
 //
 // This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set.
 //
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c 
b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
index ef49fd928e..aa230eeefa 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
@@ -1,7 +1,7 @@
 /** @file
   TCG MOR (Memory Overwrite Request) Lock Control Driver.
 
-  This driver initilize MemoryOverwriteRequestControlLock variable.
+  This driver initializes MemoryOverwriteRequestControlLock variable.
   This module will add Variable Hook and allow 
MemoryOverwriteRequestControlLock variable set only once.
 
 Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -167,7 +167,7 @@ SetVariableCheckHandlerMor (
   @param[in] ImageHandle  Image handle of this driver.
   @param[in] SystemTable  A Pointer to the EFI System Table.
 
-  @retval EFI_SUCEESS
+  @retval EFI_SUCCESS
   @return Others          Some error occurs.
 **/
 EFI_STATUS
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h 
b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
index 2ef194f92f..5a6658c158 100644
--- 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.
   @param[in] SystemTable  A Pointer to the EFI System Table.
 
-  @retval EFI_SUCEESS
+  @retval EFI_SUCCESS
   @return Others          Some error occurs.
 **/
 EFI_STATUS
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni 
b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
index 639a3edcba..711b37d866 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Initilizes MemoryOverwriteRequestControlLock variable
+// Initializes MemoryOverwriteRequestControlLock variable
 //
 // This module will add Variable Hook and allow 
MemoryOverwriteRequestControlLock variable set only once.
 //
@@ -10,7 +10,7 @@
 // **/
 
 
-#string STR_MODULE_ABSTRACT             #language en-US "Initilizes 
MemoryOverwriteRequestControlLock variable"
+#string STR_MODULE_ABSTRACT             #language en-US "Initializes 
MemoryOverwriteRequestControlLock variable"
 
 #string STR_MODULE_DESCRIPTION          #language en-US "This module will add 
Variable Hook and allow MemoryOverwriteRequestControlLock variable set only 
once."
 
diff --git 
a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf 
b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
index 67d6bda269..875c1e5f3a 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Initilizes MemoryOverwriteRequestControlLock variable
+#  Initializes MemoryOverwriteRequestControlLock variable
 #
 #  This module will add Variable Hook and allow 
MemoryOverwriteRequestControlLock variable set only once.
 #
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
index e14fa32354..77905d2bf9 100644
--- 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.
   @param SystemTable     Pointer to SystemTable.
 
-  @retval EFI_SUCESS     This function always complete successfully.
+  @retval EFI_SUCCESS     This function always complete successfully.
 **/
 EFI_STATUS
 EFIAPI
@@ -2637,7 +2637,7 @@ EfiDriverEntryPoint(
   Tests to see if this driver supports a given controller.
 
   This function checks to see if the controller contains an instance of the
-  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL and the EFI_BLOCK_IO_PROTOCL
+  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL and the EFI_BLOCK_IO_PROTOCOL
   and returns EFI_SUCCESS if it does.
 
   @param[in]  This                  A pointer to the 
EFI_DRIVER_BINDING_PROTOCOL instance.
@@ -2741,7 +2741,7 @@ OpalEfiDriverBindingSupported(
   "controller", which is a child Handle, contains the 
EF_STORAGE_SECURITY_COMMAND protocols.
   This function will complete the other necessary checks, such as verifying 
the device supports
   the correct version of Opal.  Upon verification, it will add the device to 
the
-  Opal HII list in order to expose Opal managmeent options.
+  Opal HII list in order to expose Opal management options.
 
   @param[in]  This                  A pointer to the 
EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle      The Handle of the controller to start. 
This Handle
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
index beeabb1c0a..c19d78218e 100644
--- 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;
 extern EFI_COMPONENT_NAME2_PROTOCOL  gOpalComponentName2;
 
-#define OPAL_MSID_LENGHT        128
+#define OPAL_MSID_LENGTH        128
 
 #define MAX_PASSWORD_TRY_COUNT  5
 
@@ -131,7 +131,7 @@ typedef struct {
 //
 typedef struct {
   UINT32                                          MsidLength;             // 
Byte length of MSID Pin for device
-  UINT8                                           Msid[OPAL_MSID_LENGHT]; // 
MSID Pin for device
+  UINT8                                           Msid[OPAL_MSID_LENGTH]; // 
MSID Pin for device
   EFI_STORAGE_SECURITY_COMMAND_PROTOCOL           *Sscp;
   UINT32                                          MediaId;                // 
MediaId is used by Ssc Protocol.
   EFI_DEVICE_PATH_PROTOCOL                        *OpalDevicePath;
@@ -309,7 +309,7 @@ OpalEfiDriverBindingSupported(
   "controller", which is a child handle, contains the 
EF_STORAGE_SECURITY_COMMAND protocols.
   This function will complete the other necessary checks, such as verifying 
the device supports
   the correct version of Opal.  Upon verification, it will add the device to 
the
-  Opal HII list in order to expose Opal managmeent options.
+  Opal HII list in order to expose Opal management options.
 
   @param[in]  This                  A pointer to the 
EFI_DRIVER_BINDING_PROTOCOL instance.
   @param[in]  ControllerHandle      The handle of the controller to start. 
This handle
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
index 18b65da756..ef117d3d03 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
@@ -1090,7 +1090,7 @@ OpalHiiSetBrowserData (
 
 /**
 
-  Populate the hii_g_Configuraton with the browser Data.
+  Populate the hii_g_Configuration with the browser Data.
 
 **/
 VOID
@@ -1164,7 +1164,7 @@ HiiSetFormString(
 
   @param Dev                  The Opal device.
 
-  @retval EFI_SUCESS          Initialize the device success.
+  @retval EFI_SUCCESS          Initialize the device success.
   @retval EFI_DEVICE_ERROR    Get info from device failed.
 
 **/
@@ -1193,7 +1193,7 @@ OpalDiskInitialize (
   }
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;
 
-  TcgResult = OpalUtilGetMsid (&Session, Dev->OpalDisk.Msid, OPAL_MSID_LENGHT, 
&Dev->OpalDisk.MsidLength);
+  TcgResult = OpalUtilGetMsid (&Session, Dev->OpalDisk.Msid, OPAL_MSID_LENGTH, 
&Dev->OpalDisk.MsidLength);
   if (TcgResult != TcgResultSuccess) {
     return EFI_DEVICE_ERROR;
   }
@@ -1220,7 +1220,7 @@ OpalDiskInitialize (
 
   @param OpalDisk                The Opal device.
 
-  @retval EFI_SUCESS             Get ownership success.
+  @retval EFI_SUCCESS             Get ownership success.
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change 
ownership.
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.
 
@@ -1254,7 +1254,7 @@ OpalDiskUpdateOwnerShip (
 
   @param OpalDisk                The Opal device.
 
-  @retval EFI_SUCESS             Initialize the device success.
+  @retval EFI_SUCCESS             Initialize the device success.
   @retval EFI_DEVICE_ERROR       Get info from device failed.
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change 
ownership.
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h 
b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index 89c709df99..0543a2ce49 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -156,7 +156,7 @@ OpalHiiSetBrowserData (
 
 /**
 
-  Populate the hii_g_Configuraton with the browser Data.
+  Populate the hii_g_Configuration with the browser Data.
 
 **/
 VOID
@@ -247,7 +247,7 @@ GetDiskNameStringId(
 
   @param OpalDisk                The Opal device.
 
-  @retval EFI_SUCESS             Initialize the device success.
+  @retval EFI_SUCCESS             Initialize the device success.
   @retval EFI_DEVICE_ERROR       Get info from device failed.
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.
 
@@ -348,7 +348,7 @@ HiiUninstall(
 
   @param Dev                  The Opal device.
 
-  @retval EFI_SUCESS          Initialize the device success.
+  @retval EFI_SUCCESS          Initialize the device success.
   @retval EFI_DEVICE_ERROR    Get info from device failed.
 
 **/
@@ -362,7 +362,7 @@ OpalDiskInitialize (
 
   @param OpalDisk                The Opal device.
 
-  @retval EFI_SUCESS             Get ownership success.
+  @retval EFI_SUCCESS             Get ownership success.
   @retval EFI_ACCESS_DENIED      Has send BlockSID command, can't change 
ownership.
   @retval EFI_INVALID_PARAMETER  Not get Msid info before get ownership info.
 
diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c 
b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
index f25481044f..83c3ad50d1 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
+++ b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
@@ -31,7 +31,7 @@ LockTpmPhysicalPresence (
   );
 
 //
-// Gobal defintions for lock physical presence PPI and its descriptor.
+// Global defintions for lock physical presence PPI and its descriptor.
 //
 PEI_LOCK_PHYSICAL_PRESENCE_PPI    mLockPhysicalPresencePpi = {
   LockTpmPhysicalPresence
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr 
b/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
index 12d8adb7ea..91a463997c 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
@@ -16,19 +16,19 @@ formset
 
   efivarstore TCG2_CONFIGURATION_INFO,
     varid = TCG2_CONFIGURATION_INFO_VARSTORE_ID,
-    attribute = 0x02,  // EFI variable attribures  
EFI_VARIABLE_BOOTSERVICE_ACCESS
+    attribute = 0x02,  // EFI variable attributes  
EFI_VARIABLE_BOOTSERVICE_ACCESS
     name  = TCG2_CONFIGURATION_INFO,
     guid  = TCG2_CONFIG_FORM_SET_GUID;
 
   efivarstore TCG2_CONFIGURATION,
     varid = TCG2_CONFIGURATION_VARSTORE_ID,
-    attribute = 0x03,  // EFI variable attribures  
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE
+    attribute = 0x03,  // EFI variable attributes  
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE
     name  = TCG2_CONFIGURATION,
     guid  = TCG2_CONFIG_FORM_SET_GUID;
 
   efivarstore TCG2_VERSION,
     varid = TCG2_VERSION_VARSTORE_ID,
-    attribute = 0x03,  // EFI variable attribures  
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE
+    attribute = 0x03,  // EFI variable attributes  
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE
     name  = TCG2_VERSION,
     guid  = TCG2_CONFIG_FORM_SET_GUID;
 
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c 
b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
index 9052eced75..10d1c5cc78 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
@@ -240,7 +240,7 @@ InitializeTcg2VersionInfo (
 
   @retval EFI_ALREADY_STARTED    The driver already exists in system.
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of 
resources.
-  @retval EFI_SUCCES             All the related protocols are installed on 
the driver.
+  @retval EFI_SUCCESS            All the related protocols are installed on 
the driver.
   @retval Others                 Fail to install protocols as indicated.
 
 **/
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c 
b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index a15919685e..e0d0a207e1 100644
--- 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.
   @param  PeiServices Describes the list of possible PEI Services.
 
-  @retval EFI_SUCCES             Convert variable to PCD successfully.
+  @retval EFI_SUCCESS            Convert variable to PCD successfully.
   @retval Others                 Fail to convert variable to PCD.
 **/
 EFI_STATUS
@@ -118,7 +118,7 @@ Tcg2ConfigPeimEntryPoint (
 
   //
   // Convert variable to PCD.
-  // This is work-around because there is no gurantee DynamicHiiPcd can return 
correct value in DXE phase.
+  // This is work-around because there is no guarantee DynamicHiiPcd can 
return correct value in DXE phase.
   // Using DynamicPcd instead.
   //
   // NOTE: Tcg2Configuration variable contains the desired TpmDevice type,
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c 
b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
index 4e67ac533f..347c6ab702 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
@@ -86,7 +86,7 @@ Tcg2DxeImageRead (
   @param[in]  PCRIndex       TPM PCR index
   @param[in]  ImageAddress   Start address of image buffer.
   @param[in]  ImageSize      Image size
-  @param[out] DigestList     Digeest list of this image.
+  @param[out] DigestList     Digest list of this image.
 
   @retval EFI_SUCCESS            Successfully measure image.
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c 
b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 85f2e0ae38..3cd16c2fa3 100644
--- 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
   @param[in]  ImageAddress   Start address of image buffer.
   @param[in]  ImageSize      Image size
-  @param[out] DigestList     Digeest list of this image.
+  @param[out] DigestList     Digest list of this image.
 
   @retval EFI_SUCCESS            Successfully measure image.
   @retval EFI_OUT_OF_RESOURCES   No enough resource to measure image.
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c 
b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index f28f33fdec..1565d4e402 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -79,7 +79,7 @@ UINT32 mMeasuredMaxChildFvIndex = 0;
 UINT32 mMeasuredChildFvIndex = 0;
 
 /**
-  Measure and record the Firmware Volum Information once FvInfoPPI install.
+  Measure and record the Firmware Volume Information once FvInfoPPI install.
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -91,14 +91,14 @@ UINT32 mMeasuredChildFvIndex = 0;
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,
   IN VOID                          *Ppi
   );
 
 /**
-  Record all measured Firmware Volum Information into a Guid Hob
+  Record all measured Firmware Volume Information into a Guid Hob
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -120,12 +120,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
   {
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,
     &gEfiPeiFirmwareVolumeInfoPpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   },
   {
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   },
   {
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | 
EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
@@ -136,7 +136,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
 
 
 /**
-  Record all measured Firmware Volum Information into a Guid Hob
+  Record all measured Firmware Volume Information into a Guid Hob
   Guid Hob payload layout is
 
      UINT32 *************************** FIRMWARE_BLOB number
@@ -688,7 +688,7 @@ MeasureMainBios (
 }
 
 /**
-  Measure and record the Firmware Volum Information once FvInfoPPI install.
+  Measure and record the Firmware Volume Information once FvInfoPPI install.
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -700,7 +700,7 @@ MeasureMainBios (
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES               **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,
   IN VOID                           *Ppi
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c 
b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 14e4ed0ee1..bd786bf479 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
@@ -269,7 +269,7 @@ UpdatePPVersion (
 
 /**
   Patch interrupt resources returned by TPM _PRS. ResourceTemplate to patch is 
determined by input
-  interrupt buffer size. BufferSize, PkgLength and interrupt descirptor in 
ByteList need to be patched
+  interrupt buffer size. BufferSize, PkgLength and interrupt descriptor in 
ByteList need to be patched
 
   @param[in, out] Table            The TPM item in ACPI table.
   @param[in]      IrqBuffer        Input new IRQ buffer.
@@ -304,7 +304,7 @@ UpdatePossibleResource (
   // to patch TPM ACPI object _PRS returned ResourceTemplate() containing 2 
resource descriptors and an auto appended End Tag
   //
   //  AML data is organized by following rule.
-  //  Code need to patch BufferSize and PkgLength and interrupt descirptor in 
ByteList
+  //  Code need to patch BufferSize and PkgLength and interrupt descriptor in 
ByteList
   //
   // =============  Buffer ====================
   //           DefBuffer := BufferOp PkgLength BufferSize ByteList
@@ -321,8 +321,8 @@ UpdatePossibleResource (
   //                               <bit 3-0: Least significant package length 
nybble>
   //
   //==============BufferSize==================
-  //        BufferSize := Integar
-  //           Integar := ByteConst|WordConst|DwordConst....
+  //        BufferSize := Integer
+  //           Integer := ByteConst|WordConst|DwordConst....
   //
   //           ByteConst := BytePrefix ByteData
   //
@@ -371,7 +371,7 @@ UpdatePossibleResource (
       }
 
       //
-      // Include Memory32Fixed Descritor (12 Bytes) + Interrupt Descriptor 
header(5 Bytes) + End Tag(2 Bytes)
+      // Include Memory32Fixed Descriptor (12 Bytes) + Interrupt Descriptor 
header(5 Bytes) + End Tag(2 Bytes)
       //
       NewPkgLength += 19 + IrqBuffserSize;
       if (NewPkgLength > 63) {
@@ -389,7 +389,7 @@ UpdatePossibleResource (
       *DataPtr = (UINT8)NewPkgLength;
 
       //
-      // 1.2 Patch BufferSize = sizeof(Memory32Fixed Descritor + Interrupt 
Descriptor + End Tag).
+      // 1.2 Patch BufferSize = sizeof(Memory32Fixed Descriptor + Interrupt 
Descriptor + End Tag).
       //      It is Little endian. So only patch lowest byte of BufferSize due 
to current interrupt number limit.
       //
       *(DataPtr + 2) = (UINT8)(IrqBuffserSize + 19);
@@ -445,7 +445,7 @@ UpdatePossibleResource (
         }
 
         //
-        // Include Memory32Fixed Descritor (12 Bytes) + Interrupt Descriptor 
header(5 Bytes) + End Tag(2  Bytes)
+        // Include Memory32Fixed Descriptor (12 Bytes) + Interrupt Descriptor 
header(5 Bytes) + End Tag(2  Bytes)
         //
         NewPkgLength += 19 + IrqBuffserSize;
 
@@ -461,7 +461,7 @@ UpdatePossibleResource (
         *(DataPtr + 1) = (UINT8)((NewPkgLength & 0xFF0) >> 4);
 
         //
-        // 2.2 Patch BufferSize = sizeof(Memory32Fixed Descritor + Interrupt 
Descriptor + End Tag).
+        // 2.2 Patch BufferSize = sizeof(Memory32Fixed Descriptor + Interrupt 
Descriptor + End Tag).
         //     It is Little endian. Only patch lowest byte of BufferSize due 
to current interrupt number limit.
         //
         *(DataPtr + 2 + ((*DataPtr & (BIT7|BIT6)) >> 6)) = 
(UINT8)(IrqBuffserSize + 19);
@@ -485,7 +485,7 @@ UpdatePossibleResource (
   //
   DataPtr += NewPkgLength - (5 + IrqBuffserSize + 2);
   //
-  //   3.1 Patch Length bit[7:0] of Interrupt descirptor patch interrupt 
descriptor
+  //   3.1 Patch Length bit[7:0] of Interrupt descriptor patch interrupt 
descriptor
   //
   *(DataPtr + 1) = (UINT8)(2 + IrqBuffserSize);
   //
@@ -498,7 +498,7 @@ UpdatePossibleResource (
   CopyMem(DataPtr + 5, IrqBuffer, IrqBuffserSize);
 
   //
-  // 4. Jump over Interrupt descirptor and Patch END Tag, set Checksum field 
to 0
+  // 4. Jump over Interrupt descriptor and Patch END Tag, set Checksum field 
to 0
   //
   DataPtr       += 5 + IrqBuffserSize;
   *DataPtr       = ACPI_END_TAG_DESCRIPTOR;
@@ -715,7 +715,7 @@ PublishAcpiTable (
   mTcgNvs->IsShortFormPkgLength = IsShortFormPkgLength;
 
   //
-  // Publish the TPM ACPI table. Table is re-checksumed.
+  // Publish the TPM ACPI table. Table is re-checksummed.
   //
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) 
&AcpiTable);
   ASSERT_EFI_ERROR (Status);
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
index 9c4b9afa46..7a91708a1a 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
@@ -76,17 +76,17 @@ DefinitionBlock (
       Field (TNVS, AnyAcc, NoLock, Preserve)
       {
         PPIN,   8,  //   Software SMI for Physical Presence Interface
-        PPIP,   32, //   Used for save physical presence paramter
+        PPIP,   32, //   Used for save physical presence parameter
         PPRP,   32, //   Physical Presence request operation response
         PPRQ,   32, //   Physical Presence request operation
         PPRM,   32, //   Physical Presence request operation parameter
         LPPR,   32, //   Last Physical Presence request operation
         FRET,   32, //   Physical Presence function return code
         MCIN,   8,  //   Software SMI for Memory Clear Interface
-        MCIP,   32, //   Used for save the Mor paramter
+        MCIP,   32, //   Used for save the Mor parameter
         MORD,   32, //   Memory Overwrite Request Data
         MRET,   32, //   Memory Overwrite function return code
-        UCRQ,   32, //   Phyical Presence request operation to Get User 
Confirmation Status
+        UCRQ,   32, //   Physical Presence request operation to Get User 
Confirmation Status
         IRQN,   32, //   IRQ Number for _CRS
         SFRB,   8   //   Is shortformed Pkglength for resource buffer
       }
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c 
b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
index fb06624fdb..8210548077 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @retval EFI_ALREADY_STARTED    The driver already exists in system.
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of 
resources.
-  @retval EFI_SUCCES             All the related protocols are installed on 
the driver.
+  @retval EFI_SUCCESS            All the related protocols are installed on 
the driver.
   @retval Others                 Fail to install protocols as indicated.
 
 **/
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 6feb886308..3990d1e937 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -79,7 +79,7 @@ EFI_TCG_CLIENT_ACPI_TABLE           mTcgClientAcpiTemplate = {
 
 //
 // The following EFI_TCG_SERVER_ACPI_TABLE default setting is just one example,
-// the TPM device connectes to LPC, and also defined the ACPI _UID as 0xFF,
+// the TPM device connects to LPC, and also defined the ACPI _UID as 0xFF,
 // this _UID can be changed and should match with the _UID setting of the TPM
 // ACPI device object
 //
@@ -1224,7 +1224,7 @@ InstallAcpiTable (
     mTcgClientAcpiTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
     mTcgClientAcpiTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
     //
-    // The ACPI table must be checksumed before calling the InstallAcpiTable()
+    // The ACPI table must be checksummed before calling the InstallAcpiTable()
     // service of the ACPI table protocol to install it.
     //
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgClientAcpiTemplate, sizeof 
(mTcgClientAcpiTemplate));
@@ -1244,7 +1244,7 @@ InstallAcpiTable (
     mTcgServerAcpiTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
     mTcgServerAcpiTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
     //
-    // The ACPI table must be checksumed before calling the InstallAcpiTable()
+    // The ACPI table must be checksummed before calling the InstallAcpiTable()
     // service of the ACPI table protocol to install it.
     //
     Checksum = CalculateCheckSum8 ((UINT8 *)&mTcgServerAcpiTemplate, sizeof 
(mTcgServerAcpiTemplate));
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index 0adfcc50c5..284fc394f0 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -85,7 +85,7 @@ PhysicalPresencePpiNotifyCallback (
   );
 
 /**
-  Measure and record the Firmware Volum Information once FvInfoPPI install.
+  Measure and record the Firmware Volume Information once FvInfoPPI install.
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -97,14 +97,14 @@ PhysicalPresencePpiNotifyCallback (
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,
   IN VOID                          *Ppi
   );
 
 /**
-  Record all measured Firmware Volum Information into a Guid Hob
+  Record all measured Firmware Volume Information into a Guid Hob
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -131,12 +131,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
   {
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,
     &gEfiPeiFirmwareVolumeInfoPpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   },
   {
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   },
   {
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | 
EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
@@ -146,7 +146,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
 };
 
 /**
-  Record all measured Firmware Volum Information into a Guid Hob
+  Record all measured Firmware Voluem Information into a Guid Hob
   Guid Hob payload layout is
 
      UINT32 *************************** FIRMWARE_BLOB number
@@ -501,7 +501,7 @@ MeasureMainBios (
 }
 
 /**
-  Measure and record the Firmware Volum Information once FvInfoPPI install.
+  Measure and record the Firmware Voluem Information once FvInfoPPI install.
 
   @param[in] PeiServices       An indirect pointer to the EFI_PEI_SERVICES 
table published by the PEI Foundation.
   @param[in] NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -513,7 +513,7 @@ MeasureMainBios (
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES               **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR      *NotifyDescriptor,
   IN VOID                           *Ppi
@@ -672,7 +672,7 @@ PhysicalPresencePpiNotifyCallback (
 }
 
 /**
-  Check if TPM chip is activeated or not.
+  Check if TPM chip is activated or not.
 
   @param[in]      PeiServices   Describes the list of possible PEI Services.
 
diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
index 6ddc47ae91..739067dbec 100644
--- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
+++ b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
@@ -64,16 +64,16 @@ DefinitionBlock (
       Field (TNVS, AnyAcc, NoLock, Preserve)
       {
         PPIN,   8,  //   Software SMI for Physical Presence Interface
-        PPIP,   32, //   Used for save physical presence paramter
+        PPIP,   32, //   Used for save physical presence parameter
         PPRP,   32, //   Physical Presence request operation response
         PPRQ,   32, //   Physical Presence request operation
         LPPR,   32, //   Last Physical Presence request operation
         FRET,   32, //   Physical Presence function return code
         MCIN,   8,  //   Software SMI for Memory Clear Interface
-        MCIP,   32, //   Used for save the Mor paramter
+        MCIP,   32, //   Used for save the Mor parameter
         MORD,   32, //   Memory Overwrite Request Data
         MRET,   32, //   Memory Overwrite function return code
-        UCRQ,   32  //   Phyical Presence request operation to Get User 
Confirmation Status
+        UCRQ,   32  //   Physical Presence request operation to Get User 
Confirmation Status
       }
 
       Method (PTS, 1, Serialized)
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
index 6c0294151e..8936a0a634 100644
--- 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
+++ 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @retval EFI_ALREADY_STARTED    The driver already exists in system.
   @retval EFI_OUT_OF_RESOURCES   Fail to execute entry point due to lack of 
resources.
-  @retval EFI_SUCCES             All the related protocols are installed on 
the driver.
+  @retval EFI_SUCCESS            All the related protocols are installed on 
the driver.
   @retval Others                 Fail to get the SecureBootEnable variable.
 
 **/
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
index 55a4239252..573efa6379 100644
--- 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+++ 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Provides the capbility to configure secure boot in a setup browser
+#  Provides the capability to configure secure boot in a setup browser
 #  By this module, user may change the content of DB, DBX, PK and KEK.
 #
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
index 56097deee5..4e9c6f3ff7 100644
--- 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
+++ 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Provides the capbility to configure secure boot in a setup browser
+// Provides the capability to configure secure boot in a setup browser
 //
 // By this module, user may change the content of DB, DBX, PK and KEK.
 //
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index a15038da12..83497a23f5 100644
--- 
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.
 
   @retval EFI_SUCCESS              Create time based payload successfully.
-  @retval EFI_OUT_OF_RESOURCES     There are not enough memory resourses to 
create time based payload.
+  @retval EFI_OUT_OF_RESOURCES     There are not enough memory resources to 
create time based payload.
   @retval EFI_INVALID_PARAMETER    The parameter is invalid.
   @retval Others                   Unexpected error happens.
 
@@ -390,7 +390,7 @@ SetSecureBootMode (
   @param[out]  PkCert                Point to the data buffer to store the 
signature list.
 
   @return EFI_UNSUPPORTED            Unsupported Key Length.
-  @return EFI_OUT_OF_RESOURCES       There are not enough memory resourses to 
form the signature list.
+  @return EFI_OUT_OF_RESOURCES       There are not enough memory resources to 
form the signature list.
 
 **/
 EFI_STATUS
@@ -507,7 +507,7 @@ EnrollPlatformKey (
   DEBUG ((EFI_D_INFO, "FilePostFix = %s\n", FilePostFix));
 
   //
-  // Prase the selected PK file and generature PK certificate list.
+  // Prase the selected PK file and generate PK certificate list.
   //
   Status = CreatePkX509SignatureList (
             Private->FileContext->FHandle,
@@ -1088,7 +1088,7 @@ IsSignatureFoundInDatabase (
   }
 
   //
-  // Enumerate all signature data in SigDB to check if executable's signature 
exists.
+  // Enumerate all signature data in SigDB to check if signature exists for 
executable.
   //
   CertList = (EFI_SIGNATURE_LIST *) Data;
   while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {
@@ -1312,7 +1312,7 @@ Done:
 /**
   Check whether the signature list exists in given variable data.
 
-  It searches the signature list for the ceritificate hash by CertType.
+  It searches the signature list for the certificate hash by CertType.
   If the signature list is found, get the offset of Database for the
   next hash of a certificate.
 
@@ -2107,7 +2107,7 @@ HashPeImageByType (
 }
 
 /**
-  Enroll a new executable's signature into Signature Database.
+  Enroll a new signature of executable into Signature Database.
 
   @param[in] PrivateData     The module's private data.
   @param[in] VariableName    Variable name of signature database, must be
@@ -2177,7 +2177,7 @@ EnrollAuthentication2Descriptor (
   }
 
   //
-  // Diretly set AUTHENTICATION_2 data to SetVariable
+  // Directly set AUTHENTICATION_2 data to SetVariable
   //
   Status = gRT->SetVariable(
                   VariableName,
@@ -2208,7 +2208,7 @@ ON_EXIT:
 
 
 /**
-  Enroll a new executable's signature into Signature Database.
+  Enroll a new signature of executable into Signature Database.
 
   @param[in] PrivateData     The module's private data.
   @param[in] VariableName    Variable name of signature database, must be
@@ -2247,7 +2247,7 @@ EnrollImageSignatureToSigDB (
   // Form the SigDB certificate list.
   // Format the data item into EFI_SIGNATURE_LIST type.
   //
-  // We need to parse executable's signature data from specified signed 
executable file.
+  // We need to parse signature data of executable from specified signed 
executable file.
   // In current implementation, we simply trust the pass-in signed executable 
file.
   // In reality, it's OS's responsibility to verify the signed executable file.
   //
@@ -3269,7 +3269,7 @@ SecureBootExtractConfigFromVariable (
   SecureBootMode   = NULL;
 
   //
-  // Initilize the Date and Time using system time.
+  // Initialize the Date and Time using system time.
   //
   ConfigData->CertificateFormat = HASHALG_RAW;
   ConfigData->AlwaysRevocation = TRUE;
@@ -3306,7 +3306,7 @@ SecureBootExtractConfigFromVariable (
   }
 
   //
-  // Check SecureBootEnable & Pk status, fix the inconsistence.
+  // Check SecureBootEnable & Pk status, fix the inconsistency.
   // If the SecureBootEnable Variable doesn't exist, hide the SecureBoot 
Enable/Disable
   // Checkbox.
   //
@@ -3314,7 +3314,7 @@ SecureBootExtractConfigFromVariable (
   GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, 
(VOID**)&SecureBootEnable, NULL);
 
   //
-  // Fix Pk, SecureBootEnable inconsistence
+  // Fix Pk and SecureBootEnable inconsistency
   //
   if ((SetupMode != NULL) && (*SetupMode) == USER_MODE) {
     ConfigData->HideSecureBoot = FALSE;
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
index 32e9619e91..1fafae07ac 100644
--- 
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.
   UINT32                            ListCount;        // Record current 
variable has how many signature list.
   UINTN                             ListIndex;        // Record which 
signature list is processing.
-  BOOLEAN                           *CheckArray;      // Record whcih 
siganture data checked.
+  BOOLEAN                           *CheckArray;      // Record which 
signature data checked.
 } SECUREBOOT_CONFIG_PRIVATE_DATA;
 
 extern SECUREBOOT_CONFIG_PRIVATE_DATA      
mSecureBootConfigPrivateDateTemplate;
@@ -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)
 
 //
-// Cryptograhpic Key Information
+// Cryptographic Key Information
 //
 #pragma pack(1)
 typedef struct _CPL_KEY_INFO {
@@ -448,12 +448,12 @@ CleanUpPage (
 
 /**
   Read file content into BufferPtr, the size of the allocate buffer
-  is *FileSize plus AddtionAllocateSize.
+  is *FileSize plus AdditionAllocateSize.
 
   @param[in]       FileHandle            The file to be read.
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated 
buffer.
   @param[out]      FileSize              Size of input file
-  @param[in]       AddtionAllocateSize   Addtion size the buffer need to be 
allocated.
+  @param[in]       AdditionAllocateSize   Addition size the buffer need to be 
allocated.
                                          In case the buffer need to contain 
others besides the file content.
 
   @retval   EFI_SUCCESS                  The file was read into the buffer.
@@ -467,7 +467,7 @@ ReadFileContent (
   IN      EFI_FILE_HANDLE           FileHandle,
   IN OUT  VOID                      **BufferPtr,
      OUT  UINTN                     *FileSize,
-  IN      UINTN                     AddtionAllocateSize
+  IN      UINTN                     AdditionAllocateSize
   );
 
 
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
index f5ce94e06d..3730fbe646 100644
--- 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
+++ 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
@@ -10,12 +10,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 /**
   Read file content into BufferPtr, the size of the allocate buffer
-  is *FileSize plus AddtionAllocateSize.
+  is *FileSize plus AdditionAllocateSize.
 
   @param[in]       FileHandle            The file to be read.
   @param[in, out]  BufferPtr             Pointers to the pointer of allocated 
buffer.
   @param[out]      FileSize              Size of input file
-  @param[in]       AddtionAllocateSize   Addtion size the buffer need to be 
allocated.
+  @param[in]       AdditionAllocateSize   Addition size the buffer need to be 
allocated.
                                          In case the buffer need to contain 
others besides the file content.
 
   @retval   EFI_SUCCESS                  The file was read into the buffer.
@@ -29,7 +29,7 @@ ReadFileContent (
   IN      EFI_FILE_HANDLE           FileHandle,
   IN OUT  VOID                      **BufferPtr,
      OUT  UINTN                     *FileSize,
-  IN      UINTN                     AddtionAllocateSize
+  IN      UINTN                     AdditionAllocateSize
   )
 
 {
@@ -62,7 +62,7 @@ ReadFileContent (
     goto ON_EXIT;
   }
 
-  BufferSize = (UINTN) SourceFileSize + AddtionAllocateSize;
+  BufferSize = (UINTN) SourceFileSize + AdditionAllocateSize;
   Buffer =  AllocateZeroPool(BufferSize);
   if (Buffer == NULL) {
     return EFI_OUT_OF_RESOURCES;
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
index 8ea551d88e..6e54a4b0f2 100644
--- 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
+++ 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
@@ -122,7 +122,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 typedef struct {
   BOOLEAN AttemptSecureBoot;   // Attempt to enable/disable Secure Boot
-  BOOLEAN HideSecureBoot;      // Hiden Attempt Secure Boot
+  BOOLEAN HideSecureBoot;      // Hidden Attempt Secure Boot
   CHAR16  SignatureGuid[SECURE_BOOT_GUID_STORAGE_SIZE];
   BOOLEAN PhysicalPresent;     // If a Physical Present User
   UINT8   SecureBootMode;      // Secure Boot Mode: Standard Or Custom
@@ -132,7 +132,7 @@ typedef struct {
   UINT8   CertificateFormat;   // The type of the certificate
   EFI_HII_DATE RevocationDate; // The revocation date of the certificate
   EFI_HII_TIME RevocationTime; // The revocation time of the certificate
-  UINT8   FileEnrollType;      // File type of sigunature enroll
+  UINT8   FileEnrollType;      // File type of signature enroll
   UINT32  ListCount;           // The count of signature list.
   UINT32  CheckedDataCount;    // The count of checked signature data.
 } SECUREBOOT_CONFIGURATION;
diff --git 
a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
 
b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
index a412d5bfe9..ac783453cc 100644
--- 
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"
 #string STR_DBX_PE_FORMAT_SHA256           #language en-US "PE Image SHA256"
 
-#string STR_DBX_AUTH_2_FORMAT_HELP         #language en-US 
"VARIABLE_AUTHENICATION_2 binary enrolled. Use raw binary to enroll it into DBX"
-#string STR_DBX_AUTH_2_FORMAT              #language en-US 
"VARIABLE_AUTHENICATION_2"
+#string STR_DBX_AUTH_2_FORMAT_HELP         #language en-US 
"VARIABLE_AUTHENTICATION_2 binary enrolled. Use raw binary to enroll it into 
DBX"
+#string STR_DBX_AUTH_2_FORMAT              #language en-US 
"VARIABLE_AUTHENTICATION_2"
 
 #string STR_CERTIFICATE_REVOCATION_TIME_PROMPT #language en-US "  Revocation 
Time"
 #string STR_CERTIFICATE_REVOCATION_TIME_HELP   #language en-US "Input the 
revocation time of the certificate"
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49376): https://edk2.groups.io/g/devel/message/49376
Mute This Topic: https://groups.io/mt/36470434/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to