From d6b926e76e3d639ac37610e97d33ff9e3a6281eb Mon Sep 17 00:00:00 2001 From: Sean Brogan Date: Wed, 9 Oct 2019 00:20:15 -0700 Subject: SecurityPkg: Fix spelling errors https://bugzilla.tianocore.org/show_bug.cgi?id=2265 Cc: Jiewen Yao Cc: Jian J Wang Cc: Chao Zhang Signed-off-by: Michael D Kinney Reviewed-by: Jiewen Yao Reviewed-by: Jian J Wang --- .../SecureBootConfigDxe/SecureBootConfigDriver.c | 2 +- .../SecureBootConfigDxe/SecureBootConfigDxe.inf | 2 +- .../SecureBootConfigDxe/SecureBootConfigDxe.uni | 2 +- .../SecureBootConfigDxe/SecureBootConfigImpl.c | 24 +++++++++++----------- .../SecureBootConfigDxe/SecureBootConfigImpl.h | 10 ++++----- .../SecureBootConfigDxe/SecureBootConfigMisc.c | 8 ++++---- .../SecureBootConfigDxe/SecureBootConfigNvData.h | 4 ++-- .../SecureBootConfigStrings.uni | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'SecurityPkg/VariableAuthenticated') diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c index 6c02941..8936a0a 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 55a4239..573efa6 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.
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni index 56097de..4e9c6f3 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 a15038d..83497a2 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 32e9619..1fafae0 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 f5ce94e..3730fbe 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 8ea551d..6e54a4b 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 a412d5b..ac78345 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" -- cgit v1.1