OvmfPkg/EnrollDefaultKeys: clean up acronym capitalization in identifiers

According to the edk2 coding standards, "[w]hen all letters in an acronym
are capitalized, it makes the prior and subsequent words visually
difficult to distinguish".

Fix the spellings of three acronyms, accordingly:
- "KEK" (Key Exchange Key) should be written as "Kek", in "mMicrosoftKEK",
- "CA" (Certificate Authority) should be written as "Ca", in
  "mMicrosoftUefiCA",
- "PCA" (Production Certificate Authority) should be written as "Pca", in
  "mMicrosoftPCA".

Generate the changes with:

  sed --regexp-extended --in-place \
    --expression='s,\<mMicrosoftKEK\>,mMicrosoftKek,g' \
    --expression='s,\<mMicrosoftUefiCA\>,mMicrosoftUefiCa,g' \
    --expression='s,\<mMicrosoftPCA\>,mMicrosoftPca,g' \
    OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1747
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Gary Lin <glin@suse.com>

diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
index fb30f4906df7c70ad12eb092e2df0e49d2117f10..be0e4d8f8e96e166ceace5cee6764e02635e3163 100644 (file)
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
@@ -103,7 +103,7 @@ STATIC CONST UINT8 mRedHatPkKek1[] = {
 //\r
 // "dbx" updates in "dbxtool" are signed with a key derived from this KEK.\r
 //\r
-STATIC CONST UINT8 mMicrosoftKEK[] = {\r
+STATIC CONST UINT8 mMicrosoftKek[] = {\r
   0x30, 0x82, 0x05, 0xe8, 0x30, 0x82, 0x03, 0xd0, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x0a, 0xd1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -230,7 +230,7 @@ STATIC CONST UINT8 mMicrosoftKEK[] = {
 // Windows 8 and Windows Server 2012 R2 boot loaders are signed with a chain\r
 // rooted in this certificate.\r
 //\r
-STATIC CONST UINT8 mMicrosoftPCA[] = {\r
+STATIC CONST UINT8 mMicrosoftPca[] = {\r
   0x30, 0x82, 0x05, 0xd7, 0x30, 0x82, 0x03, 0xbf, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x07, 0x76, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -355,7 +355,7 @@ STATIC CONST UINT8 mMicrosoftPCA[] = {
 //\r
 // To verify the "shim" binary and PCI expansion ROMs with.\r
 //\r
-STATIC CONST UINT8 mMicrosoftUefiCA[] = {\r
+STATIC CONST UINT8 mMicrosoftUefiCa[] = {\r
   0x30, 0x82, 0x06, 0x10, 0x30, 0x82, 0x03, 0xf8, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x08, 0xd3, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -943,8 +943,8 @@ ShellAppMain (
              EFI_IMAGE_SECURITY_DATABASE,\r
              &gEfiImageSecurityDatabaseGuid,\r
              &gEfiCertX509Guid,\r
-             mMicrosoftPCA,    sizeof mMicrosoftPCA,    &mMicrosoftOwnerGuid,\r
-             mMicrosoftUefiCA, sizeof mMicrosoftUefiCA, &mMicrosoftOwnerGuid,\r
+             mMicrosoftPca,    sizeof mMicrosoftPca,    &mMicrosoftOwnerGuid,\r
+             mMicrosoftUefiCa, sizeof mMicrosoftUefiCa, &mMicrosoftOwnerGuid,\r
              NULL);\r
   if (EFI_ERROR (Status)) {\r
     return 1;\r
@@ -965,7 +965,7 @@ ShellAppMain (
              &gEfiGlobalVariableGuid,\r
              &gEfiCertX509Guid,\r
              mRedHatPkKek1, sizeof mRedHatPkKek1, &gEfiCallerIdGuid,\r
-             mMicrosoftKEK, sizeof mMicrosoftKEK, &mMicrosoftOwnerGuid,\r
+             mMicrosoftKek, sizeof mMicrosoftKek, &mMicrosoftOwnerGuid,\r
              NULL);\r
   if (EFI_ERROR (Status)) {\r
     return 1;\r