]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c
NetworkPkg: Apply uncrustify changes
[mirror_edk2.git] / NetworkPkg / TlsAuthConfigDxe / TlsAuthConfigImpl.c
index 110fe871450825fbc601b65361b347ebbf0365a5..745155e6d758ea68651c30fc16c1fc120c8fcb1f 100644 (file)
@@ -9,15 +9,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "TlsAuthConfigImpl.h"\r
 \r
-VOID                    *mStartOpCodeHandle = NULL;\r
-VOID                    *mEndOpCodeHandle   = NULL;\r
-EFI_IFR_GUID_LABEL      *mStartLabel        = NULL;\r
-EFI_IFR_GUID_LABEL      *mEndLabel          = NULL;\r
+VOID                *mStartOpCodeHandle = NULL;\r
+VOID                *mEndOpCodeHandle   = NULL;\r
+EFI_IFR_GUID_LABEL  *mStartLabel        = NULL;\r
+EFI_IFR_GUID_LABEL  *mEndLabel          = NULL;\r
 \r
+CHAR16  mTlsAuthConfigStorageName[] = L"TLS_AUTH_CONFIG_IFR_NVDATA";\r
 \r
-CHAR16                  mTlsAuthConfigStorageName[] = L"TLS_AUTH_CONFIG_IFR_NVDATA";\r
-\r
-TLS_AUTH_CONFIG_PRIVATE_DATA      *mTlsAuthPrivateData = NULL;\r
+TLS_AUTH_CONFIG_PRIVATE_DATA  *mTlsAuthPrivateData = NULL;\r
 \r
 HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {\r
   {\r
@@ -25,8 +24,8 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     TLS_AUTH_CONFIG_GUID\r
@@ -35,8 +34,8 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
@@ -44,7 +43,7 @@ HII_VENDOR_DEVICE_PATH  mTlsAuthConfigHiiVendorDevicePath = {
 //\r
 // Possible DER-encoded certificate file suffixes, end with NULL pointer.\r
 //\r
-CHAR16mDerPemEncodedSuffix[] = {\r
+CHAR16  *mDerPemEncodedSuffix[] = {\r
   L".cer",\r
   L".der",\r
   L".crt",\r
@@ -63,15 +62,17 @@ CHAR16* mDerPemEncodedSuffix[] = {
 **/\r
 BOOLEAN\r
 IsDerPemEncodeCertificate (\r
-  IN CONST CHAR16         *FileSuffix\r
-)\r
+  IN CONST CHAR16  *FileSuffix\r
+  )\r
 {\r
-  UINTN     Index;\r
+  UINTN  Index;\r
+\r
   for (Index = 0; mDerPemEncodedSuffix[Index] != NULL; Index++) {\r
     if (StrCmp (FileSuffix, mDerPemEncodedSuffix[Index]) == 0) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -117,35 +118,35 @@ GuidToString (
 **/\r
 EFI_STATUS\r
 UpdateDeletePage (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private,\r
-  IN CHAR16                           *VariableName,\r
-  IN EFI_GUID                         *VendorGuid,\r
-  IN UINT16                           LabelNumber,\r
-  IN EFI_FORM_ID                      FormId,\r
-  IN EFI_QUESTION_ID                  QuestionIdBase\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName,\r
+  IN EFI_GUID                      *VendorGuid,\r
+  IN UINT16                        LabelNumber,\r
+  IN EFI_FORM_ID                   FormId,\r
+  IN EFI_QUESTION_ID               QuestionIdBase\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT32                      Index;\r
-  UINTN                       CertCount;\r
-  UINTN                       GuidIndex;\r
-  VOID                        *StartOpCodeHandle;\r
-  VOID                        *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *StartLabel;\r
-  EFI_IFR_GUID_LABEL          *EndLabel;\r
-  UINTN                       DataSize;\r
-  UINT8                       *Data;\r
-  EFI_SIGNATURE_LIST          *CertList;\r
-  EFI_SIGNATURE_DATA          *Cert;\r
-  UINT32                      ItemDataSize;\r
-  CHAR16                      *GuidStr;\r
-  EFI_STRING_ID               GuidID;\r
-  EFI_STRING_ID               Help;\r
-\r
-  Data     = NULL;\r
-  CertList = NULL;\r
-  Cert     = NULL;\r
-  GuidStr  = NULL;\r
+  EFI_STATUS          Status;\r
+  UINT32              Index;\r
+  UINTN               CertCount;\r
+  UINTN               GuidIndex;\r
+  VOID                *StartOpCodeHandle;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartLabel;\r
+  EFI_IFR_GUID_LABEL  *EndLabel;\r
+  UINTN               DataSize;\r
+  UINT8               *Data;\r
+  EFI_SIGNATURE_LIST  *CertList;\r
+  EFI_SIGNATURE_DATA  *Cert;\r
+  UINT32              ItemDataSize;\r
+  CHAR16              *GuidStr;\r
+  EFI_STRING_ID       GuidID;\r
+  EFI_STRING_ID       Help;\r
+\r
+  Data              = NULL;\r
+  CertList          = NULL;\r
+  Cert              = NULL;\r
+  GuidStr           = NULL;\r
   StartOpCodeHandle = NULL;\r
   EndOpCodeHandle   = NULL;\r
 \r
@@ -167,34 +168,34 @@ UpdateDeletePage (
   //\r
   // Create Hii Extend Label OpCode.\r
   //\r
-  StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                        StartOpCodeHandle,\r
-                                        &gEfiIfrTianoGuid,\r
-                                        NULL,\r
-                                        sizeof (EFI_IFR_GUID_LABEL)\r
-                                        );\r
-  StartLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;\r
-  StartLabel->Number        = LabelNumber;\r
-\r
-  EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                      EndOpCodeHandle,\r
-                                      &gEfiIfrTianoGuid,\r
-                                      NULL,\r
-                                      sizeof (EFI_IFR_GUID_LABEL)\r
-                                      );\r
-  EndLabel->ExtendOpCode  = EFI_IFR_EXTEND_OP_LABEL;\r
-  EndLabel->Number        = LABEL_END;\r
+  StartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                       StartOpCodeHandle,\r
+                                       &gEfiIfrTianoGuid,\r
+                                       NULL,\r
+                                       sizeof (EFI_IFR_GUID_LABEL)\r
+                                       );\r
+  StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+  StartLabel->Number       = LabelNumber;\r
+\r
+  EndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                     EndOpCodeHandle,\r
+                                     &gEfiIfrTianoGuid,\r
+                                     NULL,\r
+                                     sizeof (EFI_IFR_GUID_LABEL)\r
+                                     );\r
+  EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+  EndLabel->Number       = LABEL_END;\r
 \r
   //\r
   // Read Variable.\r
   //\r
   DataSize = 0;\r
-  Status = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, Data);\r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  Status   = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, Data);\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     goto ON_EXIT;\r
   }\r
 \r
-  Data = (UINT8 *) AllocateZeroPool (DataSize);\r
+  Data = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (Data == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -214,12 +215,11 @@ UpdateDeletePage (
   //\r
   // Enumerate all data.\r
   //\r
-  ItemDataSize = (UINT32) DataSize;\r
-  CertList = (EFI_SIGNATURE_LIST *) Data;\r
-  GuidIndex = 0;\r
+  ItemDataSize = (UINT32)DataSize;\r
+  CertList     = (EFI_SIGNATURE_LIST *)Data;\r
+  GuidIndex    = 0;\r
 \r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
-\r
     if (CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) {\r
       Help = STRING_TOKEN (STR_CERT_TYPE_PCKS_GUID);\r
     } else {\r
@@ -227,24 +227,24 @@ UpdateDeletePage (
       // The signature type is not supported in current implementation.\r
       //\r
       ItemDataSize -= CertList->SignatureListSize;\r
-      CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+      CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
       continue;\r
     }\r
 \r
-    CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+    CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
     for (Index = 0; Index < CertCount; Index++) {\r
-      Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) CertList\r
-                                              + sizeof (EFI_SIGNATURE_LIST)\r
-                                              + CertList->SignatureHeaderSize\r
-                                              + Index * CertList->SignatureSize);\r
+      Cert = (EFI_SIGNATURE_DATA *)((UINT8 *)CertList\r
+                                    + sizeof (EFI_SIGNATURE_LIST)\r
+                                    + CertList->SignatureHeaderSize\r
+                                    + Index * CertList->SignatureSize);\r
       //\r
       // Display GUID and help\r
       //\r
       GuidToString (&Cert->SignatureOwner, GuidStr, 100);\r
-      GuidID  = HiiSetString (Private->RegisteredHandle, 0, GuidStr, NULL);\r
+      GuidID = HiiSetString (Private->RegisteredHandle, 0, GuidStr, NULL);\r
       HiiCreateCheckBoxOpCode (\r
         StartOpCodeHandle,\r
-        (EFI_QUESTION_ID) (QuestionIdBase + GuidIndex++),\r
+        (EFI_QUESTION_ID)(QuestionIdBase + GuidIndex++),\r
         0,\r
         0,\r
         GuidID,\r
@@ -256,7 +256,7 @@ UpdateDeletePage (
     }\r
 \r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
 ON_EXIT:\r
@@ -304,110 +304,111 @@ ON_EXIT:
 **/\r
 EFI_STATUS\r
 DeleteCert (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private,\r
-  IN CHAR16                           *VariableName,\r
-  IN EFI_GUID                         *VendorGuid,\r
-  IN UINT16                           LabelNumber,\r
-  IN EFI_FORM_ID                      FormId,\r
-  IN EFI_QUESTION_ID                  QuestionIdBase,\r
-  IN UINTN                            DeleteIndex\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName,\r
+  IN EFI_GUID                      *VendorGuid,\r
+  IN UINT16                        LabelNumber,\r
+  IN EFI_FORM_ID                   FormId,\r
+  IN EFI_QUESTION_ID               QuestionIdBase,\r
+  IN UINTN                         DeleteIndex\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINTN                       DataSize;\r
-  UINT8                       *Data;\r
-  UINT8                       *OldData;\r
-  UINT32                      Attr;\r
-  UINT32                      Index;\r
-  EFI_SIGNATURE_LIST          *CertList;\r
-  EFI_SIGNATURE_LIST          *NewCertList;\r
-  EFI_SIGNATURE_DATA          *Cert;\r
-  UINTN                       CertCount;\r
-  UINT32                      Offset;\r
-  BOOLEAN                     IsItemFound;\r
-  UINT32                      ItemDataSize;\r
-  UINTN                       GuidIndex;\r
-\r
-  Data            = NULL;\r
-  OldData         = NULL;\r
-  CertList        = NULL;\r
-  Cert            = NULL;\r
-  Attr            = 0;\r
+  EFI_STATUS          Status;\r
+  UINTN               DataSize;\r
+  UINT8               *Data;\r
+  UINT8               *OldData;\r
+  UINT32              Attr;\r
+  UINT32              Index;\r
+  EFI_SIGNATURE_LIST  *CertList;\r
+  EFI_SIGNATURE_LIST  *NewCertList;\r
+  EFI_SIGNATURE_DATA  *Cert;\r
+  UINTN               CertCount;\r
+  UINT32              Offset;\r
+  BOOLEAN             IsItemFound;\r
+  UINT32              ItemDataSize;\r
+  UINTN               GuidIndex;\r
+\r
+  Data     = NULL;\r
+  OldData  = NULL;\r
+  CertList = NULL;\r
+  Cert     = NULL;\r
+  Attr     = 0;\r
 \r
   //\r
   // Get original signature list data.\r
   //\r
   DataSize = 0;\r
-  Status = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, NULL);\r
-  if (EFI_ERROR (Status) && Status != EFI_BUFFER_TOO_SMALL) {\r
+  Status   = gRT->GetVariable (VariableName, VendorGuid, NULL, &DataSize, NULL);\r
+  if (EFI_ERROR (Status) && (Status != EFI_BUFFER_TOO_SMALL)) {\r
     goto ON_EXIT;\r
   }\r
 \r
-  OldData = (UINT8 *) AllocateZeroPool (DataSize);\r
+  OldData = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (OldData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
   Status = gRT->GetVariable (VariableName, VendorGuid, &Attr, &DataSize, OldData);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
 \r
   //\r
   // Allocate space for new variable.\r
   //\r
-  Data = (UINT8*) AllocateZeroPool (DataSize);\r
+  Data = (UINT8 *)AllocateZeroPool (DataSize);\r
   if (Data == NULL) {\r
-    Status  =  EFI_OUT_OF_RESOURCES;\r
+    Status =  EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
 \r
   //\r
   // Enumerate all data and erasing the target item.\r
   //\r
-  IsItemFound = FALSE;\r
-  ItemDataSize = (UINT32) DataSize;\r
-  CertList = (EFI_SIGNATURE_LIST *) OldData;\r
-  Offset = 0;\r
-  GuidIndex = 0;\r
+  IsItemFound  = FALSE;\r
+  ItemDataSize = (UINT32)DataSize;\r
+  CertList     = (EFI_SIGNATURE_LIST *)OldData;\r
+  Offset       = 0;\r
+  GuidIndex    = 0;\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
     if (CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) {\r
       //\r
       // Copy EFI_SIGNATURE_LIST header then calculate the signature count in this list.\r
       //\r
-      CopyMem (Data + Offset, CertList, (sizeof(EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize));\r
-      NewCertList = (EFI_SIGNATURE_LIST*) (Data + Offset);\r
-      Offset += (sizeof(EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
-      Cert      = (EFI_SIGNATURE_DATA *) ((UINT8 *) CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
-      CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+      CopyMem (Data + Offset, CertList, (sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize));\r
+      NewCertList = (EFI_SIGNATURE_LIST *)(Data + Offset);\r
+      Offset     += (sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
+      Cert        = (EFI_SIGNATURE_DATA *)((UINT8 *)CertList + sizeof (EFI_SIGNATURE_LIST) + CertList->SignatureHeaderSize);\r
+      CertCount   = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
       for (Index = 0; Index < CertCount; Index++) {\r
         if (GuidIndex == DeleteIndex) {\r
           //\r
           // Find it! Skip it!\r
           //\r
           NewCertList->SignatureListSize -= CertList->SignatureSize;\r
-          IsItemFound = TRUE;\r
+          IsItemFound                     = TRUE;\r
         } else {\r
           //\r
           // This item doesn't match. Copy it to the Data buffer.\r
           //\r
-          CopyMem (Data + Offset, (UINT8*)(Cert), CertList->SignatureSize);\r
+          CopyMem (Data + Offset, (UINT8 *)(Cert), CertList->SignatureSize);\r
           Offset += CertList->SignatureSize;\r
         }\r
+\r
         GuidIndex++;\r
-        Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList->SignatureSize);\r
+        Cert = (EFI_SIGNATURE_DATA *)((UINT8 *)Cert + CertList->SignatureSize);\r
       }\r
     } else {\r
       //\r
       // This List doesn't match. Just copy it to the Data buffer.\r
       //\r
-      CopyMem (Data + Offset, (UINT8*)(CertList), CertList->SignatureListSize);\r
+      CopyMem (Data + Offset, (UINT8 *)(CertList), CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r
     }\r
 \r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
   if (!IsItemFound) {\r
@@ -422,23 +423,24 @@ DeleteCert (
   // Delete the EFI_SIGNATURE_LIST header if there is no signature in the list.\r
   //\r
   ItemDataSize = Offset;\r
-  CertList = (EFI_SIGNATURE_LIST *) Data;\r
-  Offset = 0;\r
+  CertList     = (EFI_SIGNATURE_LIST *)Data;\r
+  Offset       = 0;\r
   ZeroMem (OldData, ItemDataSize);\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
-    CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
+    CertCount = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
     DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));\r
     if (CertCount != 0) {\r
-      CopyMem (OldData + Offset, (UINT8*)(CertList), CertList->SignatureListSize);\r
+      CopyMem (OldData + Offset, (UINT8 *)(CertList), CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r
     }\r
+\r
     ItemDataSize -= CertList->SignatureListSize;\r
-    CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList->SignatureListSize);\r
+    CertList      = (EFI_SIGNATURE_LIST *)((UINT8 *)CertList + CertList->SignatureListSize);\r
   }\r
 \r
   DataSize = Offset;\r
 \r
-  Status = gRT->SetVariable(\r
+  Status = gRT->SetVariable (\r
                   VariableName,\r
                   VendorGuid,\r
                   Attr,\r
@@ -452,11 +454,11 @@ DeleteCert (
 \r
 ON_EXIT:\r
   if (Data != NULL) {\r
-    FreePool(Data);\r
+    FreePool (Data);\r
   }\r
 \r
   if (OldData != NULL) {\r
-    FreePool(OldData);\r
+    FreePool (OldData);\r
   }\r
 \r
   return UpdateDeletePage (\r
@@ -469,7 +471,6 @@ ON_EXIT:
            );\r
 }\r
 \r
-\r
 /**\r
   Clean the file related resource.\r
 \r
@@ -478,14 +479,14 @@ ON_EXIT:
 **/\r
 VOID\r
 CleanFileContext (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->FileContext->FHandle != NULL) {\r
     Private->FileContext->FHandle->Close (Private->FileContext->FHandle);\r
     Private->FileContext->FHandle = NULL;\r
-    if (Private->FileContext->FileName!= NULL){\r
-      FreePool(Private->FileContext->FileName);\r
+    if (Private->FileContext->FileName != NULL) {\r
+      FreePool (Private->FileContext->FileName);\r
       Private->FileContext->FileName = NULL;\r
     }\r
   }\r
@@ -509,17 +510,17 @@ CleanFileContext (
 **/\r
 EFI_STATUS\r
 ReadFileContent (\r
-  IN      EFI_FILE_HANDLE           FileHandle,\r
-  IN OUT  VOID                      **BufferPtr,\r
-     OUT  UINTN                     *FileSize,\r
-  IN      UINTN                     AddtionAllocateSize\r
+  IN      EFI_FILE_HANDLE  FileHandle,\r
+  IN OUT  VOID             **BufferPtr,\r
+  OUT  UINTN               *FileSize,\r
+  IN      UINTN            AddtionAllocateSize\r
   )\r
 \r
 {\r
-  UINTN      BufferSize;\r
-  UINT64     SourceFileSize;\r
-  VOID       *Buffer;\r
-  EFI_STATUS Status;\r
+  UINTN       BufferSize;\r
+  UINT64      SourceFileSize;\r
+  VOID        *Buffer;\r
+  EFI_STATUS  Status;\r
 \r
   if ((FileHandle == NULL) || (FileSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -530,7 +531,7 @@ ReadFileContent (
   //\r
   // Get the file size\r
   //\r
-  Status = FileHandle->SetPosition (FileHandle, (UINT64) -1);\r
+  Status = FileHandle->SetPosition (FileHandle, (UINT64)-1);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
@@ -545,20 +546,20 @@ ReadFileContent (
     goto ON_EXIT;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize + AddtionAllocateSize;\r
-  Buffer =  AllocateZeroPool(BufferSize);\r
+  BufferSize = (UINTN)SourceFileSize + AddtionAllocateSize;\r
+  Buffer     =  AllocateZeroPool (BufferSize);\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  BufferSize = (UINTN) SourceFileSize;\r
+  BufferSize = (UINTN)SourceFileSize;\r
   *FileSize  = BufferSize;\r
 \r
   Status = FileHandle->Read (FileHandle, &BufferSize, Buffer);\r
-  if (EFI_ERROR (Status) || BufferSize != *FileSize) {\r
+  if (EFI_ERROR (Status) || (BufferSize != *FileSize)) {\r
     FreePool (Buffer);\r
     Buffer = NULL;\r
-    Status  = EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
     goto ON_EXIT;\r
   }\r
 \r
@@ -579,7 +580,7 @@ ON_EXIT:
 CHAR16 *\r
 EFIAPI\r
 DevicePathToStr (\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   )\r
 {\r
   return ConvertDevicePathToText (\r
@@ -589,7 +590,6 @@ DevicePathToStr (
            );\r
 }\r
 \r
-\r
 /**\r
   Extract filename from device path. The returned buffer is allocated using AllocateCopyPool.\r
   The caller is responsible for freeing the allocated buffer using FreePool(). If return NULL\r
@@ -603,34 +603,34 @@ DevicePathToStr (
 **/\r
 CHAR16 *\r
 ExtractFileNameFromDevicePath (\r
-  IN   EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+  IN   EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  CHAR16          *String;\r
-  CHAR16          *MatchString;\r
-  CHAR16          *LastMatch;\r
-  CHAR16          *FileName;\r
-  UINTN           Length;\r
+  CHAR16  *String;\r
+  CHAR16  *MatchString;\r
+  CHAR16  *LastMatch;\r
+  CHAR16  *FileName;\r
+  UINTN   Length;\r
 \r
-  ASSERT(DevicePath != NULL);\r
+  ASSERT (DevicePath != NULL);\r
 \r
-  String = DevicePathToStr(DevicePath);\r
+  String      = DevicePathToStr (DevicePath);\r
   MatchString = String;\r
   LastMatch   = String;\r
   FileName    = NULL;\r
 \r
-  while(MatchString != NULL){\r
+  while (MatchString != NULL) {\r
     LastMatch   = MatchString + 1;\r
-    MatchString = StrStr(LastMatch,L"\\");\r
+    MatchString = StrStr (LastMatch, L"\\");\r
   }\r
 \r
-  Length = StrLen(LastMatch);\r
-  FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);\r
+  Length   = StrLen (LastMatch);\r
+  FileName = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), LastMatch);\r
   if (FileName != NULL) {\r
     *(FileName + Length) = 0;\r
   }\r
 \r
-  FreePool(String);\r
+  FreePool (String);\r
 \r
   return FileName;\r
 }\r
@@ -647,28 +647,28 @@ ExtractFileNameFromDevicePath (
 **/\r
 EFI_STATUS\r
 EnrollX509toVariable (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA   *Private,\r
-  IN CHAR16                         *VariableName\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private,\r
+  IN CHAR16                        *VariableName\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             X509DataSize;\r
-  VOID                              *X509Data;\r
-  EFI_SIGNATURE_LIST                *CACert;\r
-  EFI_SIGNATURE_DATA                *CACertData;\r
-  VOID                              *Data;\r
-  UINTN                             DataSize;\r
-  UINTN                             SigDataSize;\r
-  UINT32                            Attr;\r
-\r
-  X509DataSize  = 0;\r
-  SigDataSize   = 0;\r
-  DataSize      = 0;\r
-  X509Data      = NULL;\r
-  CACert        = NULL;\r
-  CACertData    = NULL;\r
-  Data          = NULL;\r
-  Attr          = 0;\r
+  EFI_STATUS          Status;\r
+  UINTN               X509DataSize;\r
+  VOID                *X509Data;\r
+  EFI_SIGNATURE_LIST  *CACert;\r
+  EFI_SIGNATURE_DATA  *CACertData;\r
+  VOID                *Data;\r
+  UINTN               DataSize;\r
+  UINTN               SigDataSize;\r
+  UINT32              Attr;\r
+\r
+  X509DataSize = 0;\r
+  SigDataSize  = 0;\r
+  DataSize     = 0;\r
+  X509Data     = NULL;\r
+  CACert       = NULL;\r
+  CACertData   = NULL;\r
+  Data         = NULL;\r
+  Attr         = 0;\r
 \r
   Status = ReadFileContent (\r
              Private->FileContext->FHandle,\r
@@ -679,9 +679,10 @@ EnrollX509toVariable (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
+\r
   ASSERT (X509Data != NULL);\r
 \r
-  SigDataSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + X509DataSize;\r
+  SigDataSize = sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 + X509DataSize;\r
 \r
   Data = AllocateZeroPool (SigDataSize);\r
   if (Data == NULL) {\r
@@ -692,22 +693,22 @@ EnrollX509toVariable (
   //\r
   // Fill Certificate Database parameters.\r
   //\r
-  CACert = (EFI_SIGNATURE_LIST*) Data;\r
-  CACert->SignatureListSize   = (UINT32) SigDataSize;\r
+  CACert                      = (EFI_SIGNATURE_LIST *)Data;\r
+  CACert->SignatureListSize   = (UINT32)SigDataSize;\r
   CACert->SignatureHeaderSize = 0;\r
-  CACert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + X509DataSize);\r
+  CACert->SignatureSize       = (UINT32)(sizeof (EFI_SIGNATURE_DATA) - 1 + X509DataSize);\r
   CopyGuid (&CACert->SignatureType, &gEfiCertX509Guid);\r
 \r
-  CACertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) CACert + sizeof (EFI_SIGNATURE_LIST));\r
+  CACertData = (EFI_SIGNATURE_DATA *)((UINT8 *)CACert + sizeof (EFI_SIGNATURE_LIST));\r
   CopyGuid (&CACertData->SignatureOwner, Private->CertGuid);\r
-  CopyMem ((UINT8* ) (CACertData->SignatureData), X509Data, X509DataSize);\r
+  CopyMem ((UINT8 *)(CACertData->SignatureData), X509Data, X509DataSize);\r
 \r
   //\r
   // Check if the signature database entry already exists. If it does, use the\r
   // EFI_VARIABLE_APPEND_WRITE attribute to append the new signature data to\r
   // the original variable, plus preserve the original variable attributes.\r
   //\r
-  Status = gRT->GetVariable(\r
+  Status = gRT->GetVariable (\r
                   VariableName,\r
                   &gEfiTlsCaCertificateGuid,\r
                   &Attr,\r
@@ -722,7 +723,7 @@ EnrollX509toVariable (
     goto ON_EXIT;\r
   }\r
 \r
-  Status = gRT->SetVariable(\r
+  Status = gRT->SetVariable (\r
                   VariableName,\r
                   &gEfiTlsCaCertificateGuid,\r
                   Attr,\r
@@ -770,8 +771,8 @@ EnrollCertDatabase (
   IN CHAR16                        *VariableName\r
   )\r
 {\r
-  UINT16*      FilePostFix;\r
-  UINTN        NameLength;\r
+  UINT16  *FilePostFix;\r
+  UINTN   NameLength;\r
 \r
   if ((Private->FileContext->FileName == NULL) || (Private->FileContext->FHandle == NULL) || (Private->CertGuid == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -784,6 +785,7 @@ EnrollCertDatabase (
   if (NameLength <= 4) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   FilePostFix = Private->FileContext->FileName + NameLength - 4;\r
 \r
   if (IsDerPemEncodeCertificate (FilePostFix)) {\r
@@ -820,12 +822,12 @@ RefreshUpdateData (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                        mStartOpCodeHandle,\r
+                                        &gEfiIfrTianoGuid,\r
+                                        NULL,\r
+                                        sizeof (EFI_IFR_GUID_LABEL)\r
+                                        );\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 }\r
 \r
@@ -838,8 +840,8 @@ RefreshUpdateData (
 **/\r
 VOID\r
 CleanUpPage (\r
-  IN UINT16                           LabelId,\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *PrivateData\r
+  IN UINT16                        LabelId,\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *PrivateData\r
   )\r
 {\r
   RefreshUpdateData ();\r
@@ -868,19 +870,20 @@ CleanUpPage (
 \r
 **/\r
 BOOLEAN\r
-UpdatePage(\r
+UpdatePage (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
   IN  EFI_FORM_ID               FormId\r
   )\r
 {\r
-  CHAR16                *FileName;\r
-  EFI_STRING_ID         StringToken;\r
+  CHAR16         *FileName;\r
+  EFI_STRING_ID  StringToken;\r
 \r
   FileName = NULL;\r
 \r
   if (FilePath != NULL) {\r
-    FileName = ExtractFileNameFromDevicePath(FilePath);\r
+    FileName = ExtractFileNameFromDevicePath (FilePath);\r
   }\r
+\r
   if (FileName == NULL) {\r
     //\r
     // FileName = NULL has two case:\r
@@ -890,6 +893,7 @@ UpdatePage(
     //\r
     return TRUE;\r
   }\r
+\r
   StringToken =  HiiSetString (mTlsAuthPrivateData->RegisteredHandle, 0, FileName, NULL);\r
 \r
   mTlsAuthPrivateData->FileContext->FileName = FileName;\r
@@ -912,7 +916,7 @@ UpdatePage(
     0,\r
     0,\r
     0\r
-   );\r
+    );\r
 \r
   HiiUpdateForm (\r
     mTlsAuthPrivateData->RegisteredHandle,\r
@@ -936,10 +940,10 @@ UpdatePage(
 BOOLEAN\r
 EFIAPI\r
 UpdateCAFromFile (\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *FilePath\r
   )\r
 {\r
-  return UpdatePage(FilePath, TLS_AUTH_CONFIG_FORMID4_FORM);\r
+  return UpdatePage (FilePath, TLS_AUTH_CONFIG_FORMID4_FORM);\r
 }\r
 \r
 /**\r
@@ -954,7 +958,7 @@ UpdateCAFromFile (
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormUnload (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
   if (Private->DriverHandle != NULL) {\r
@@ -1001,7 +1005,6 @@ TlsAuthConfigFormUnload (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initialize the configuration form.\r
 \r
@@ -1013,10 +1016,10 @@ TlsAuthConfigFormUnload (
 **/\r
 EFI_STATUS\r
 TlsAuthConfigFormInit (\r
-  IN TLS_AUTH_CONFIG_PRIVATE_DATA     *Private\r
+  IN TLS_AUTH_CONFIG_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
+  EFI_STATUS  Status;\r
 \r
   Private->Signature = TLS_AUTH_CONFIG_PRIVATE_DATA_SIGNATURE;\r
 \r
@@ -1078,23 +1081,23 @@ TlsAuthConfigFormInit (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                        mStartOpCodeHandle,\r
+                                        &gEfiIfrTianoGuid,\r
+                                        NULL,\r
+                                        sizeof (EFI_IFR_GUID_LABEL)\r
+                                        );\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r
-  mEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                       mEndOpCodeHandle,\r
-                                       &gEfiIfrTianoGuid,\r
-                                       NULL,\r
-                                       sizeof (EFI_IFR_GUID_LABEL)\r
-                                       );\r
+  mEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                      mEndOpCodeHandle,\r
+                                      &gEfiIfrTianoGuid,\r
+                                      NULL,\r
+                                      sizeof (EFI_IFR_GUID_LABEL)\r
+                                      );\r
   mEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   mEndLabel->Number       = LABEL_END;\r
 \r
@@ -1185,15 +1188,15 @@ TlsAuthConfigAccessExtractConfig (
   OUT       EFI_STRING                      *Results\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINTN                             BufferSize;\r
-  UINTN                             Size;\r
-  EFI_STRING                        ConfigRequest;\r
-  EFI_STRING                        ConfigRequestHdr;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA      *Private;\r
-  BOOLEAN                           AllocatedRequest;\r
-\r
-  if (Progress == NULL || Results == NULL) {\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  UINTN                         Size;\r
+  EFI_STRING                    ConfigRequest;\r
+  EFI_STRING                    ConfigRequestHdr;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
+  BOOLEAN                       AllocatedRequest;\r
+\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1202,12 +1205,12 @@ TlsAuthConfigAccessExtractConfig (
   ConfigRequest    = NULL;\r
   Size             = 0;\r
 \r
-  Private          = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
+  Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
 \r
-  BufferSize       = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
+  BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
   ZeroMem (&Private->TlsAuthConfigNvData, BufferSize);\r
 \r
-  *Progress        = Request;\r
+  *Progress = Request;\r
 \r
   if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTlsAuthConfigGuid, mTlsAuthConfigStorageName)) {\r
     return EFI_NOT_FOUND;\r
@@ -1222,8 +1225,8 @@ TlsAuthConfigAccessExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, Private->DriverHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -1234,7 +1237,7 @@ TlsAuthConfigAccessExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) &Private->TlsAuthConfigNvData,\r
+                                (UINT8 *)&Private->TlsAuthConfigNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -1307,13 +1310,14 @@ TlsAuthConfigAccessRouteConfig (
   OUT       EFI_STRING                      *Progress\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  UINTN                            BufferSize;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA     *Private;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         BufferSize;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
 \r
   if (Progress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Configuration;\r
 \r
   if (Configuration == NULL) {\r
@@ -1336,7 +1340,7 @@ TlsAuthConfigAccessRouteConfig (
   Status = gHiiConfigRouting->ConfigToBlock (\r
                                 gHiiConfigRouting,\r
                                 Configuration,\r
-                                (UINT8 *) &Private->TlsAuthConfigNvData,\r
+                                (UINT8 *)&Private->TlsAuthConfigNvData,\r
                                 &BufferSize,\r
                                 Progress\r
                                 );\r
@@ -1375,26 +1379,26 @@ TlsAuthConfigAccessRouteConfig (
 EFI_STATUS\r
 EFIAPI\r
 TlsAuthConfigAccessCallback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  RETURN_STATUS                   RStatus;\r
-  TLS_AUTH_CONFIG_PRIVATE_DATA    *Private;\r
-  UINTN                           BufferSize;\r
-  TLS_AUTH_CONFIG_IFR_NVDATA      *IfrNvData;\r
-  UINT16                          LabelId;\r
-  EFI_DEVICE_PATH_PROTOCOL        *File;\r
-  EFI_HII_POPUP_PROTOCOL          *HiiPopUp;\r
-  EFI_HII_POPUP_SELECTION         PopUpSelect;\r
-\r
-  Status           = EFI_SUCCESS;\r
-  File             = NULL;\r
+  EFI_STATUS                    Status;\r
+  RETURN_STATUS                 RStatus;\r
+  TLS_AUTH_CONFIG_PRIVATE_DATA  *Private;\r
+  UINTN                         BufferSize;\r
+  TLS_AUTH_CONFIG_IFR_NVDATA    *IfrNvData;\r
+  UINT16                        LabelId;\r
+  EFI_DEVICE_PATH_PROTOCOL      *File;\r
+  EFI_HII_POPUP_PROTOCOL        *HiiPopUp;\r
+  EFI_HII_POPUP_SELECTION       PopUpSelect;\r
+\r
+  Status = EFI_SUCCESS;\r
+  File   = NULL;\r
 \r
   if ((This == NULL) || (Value == NULL) || (ActionRequest == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1403,7 +1407,7 @@ TlsAuthConfigAccessCallback (
   Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This);\r
 \r
   mTlsAuthPrivateData = Private;\r
-  Status = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, (VOID**) &HiiPopUp);\r
+  Status              = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, (VOID **)&HiiPopUp);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Can't find Form PopUp protocol. Exit (%r)\n", Status));\r
     return Status;\r
@@ -1413,122 +1417,128 @@ TlsAuthConfigAccessCallback (
   // Retrieve uncommitted data from Browser\r
   //\r
   BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
-  IfrNvData = AllocateZeroPool (BufferSize);\r
+  IfrNvData  = AllocateZeroPool (BufferSize);\r
   if (IfrNvData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  HiiGetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *) IfrNvData);\r
+  HiiGetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *)IfrNvData);\r
 \r
   if ((Action != EFI_BROWSER_ACTION_CHANGED) &&\r
       (Action != EFI_BROWSER_ACTION_CHANGING) &&\r
-      (Action != EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
+      (Action != EFI_BROWSER_ACTION_FORM_CLOSE))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto EXIT;\r
   }\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case KEY_TLS_AUTH_CONFIG_CLIENT_CERT:\r
-    case KEY_TLS_AUTH_CONFIG_SERVER_CA:\r
-      //\r
-      // Clear Cert GUID.\r
-      //\r
-      ZeroMem (IfrNvData->CertGuid, sizeof (IfrNvData->CertGuid));\r
-      if (Private->CertGuid == NULL) {\r
-        Private->CertGuid = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID));\r
+      case KEY_TLS_AUTH_CONFIG_CLIENT_CERT:\r
+      case KEY_TLS_AUTH_CONFIG_SERVER_CA:\r
+        //\r
+        // Clear Cert GUID.\r
+        //\r
+        ZeroMem (IfrNvData->CertGuid, sizeof (IfrNvData->CertGuid));\r
         if (Private->CertGuid == NULL) {\r
-          return EFI_OUT_OF_RESOURCES;\r
+          Private->CertGuid = (EFI_GUID *)AllocateZeroPool (sizeof (EFI_GUID));\r
+          if (Private->CertGuid == NULL) {\r
+            return EFI_OUT_OF_RESOURCES;\r
+          }\r
         }\r
-      }\r
-      if (QuestionId == KEY_TLS_AUTH_CONFIG_CLIENT_CERT) {\r
-        LabelId = TLS_AUTH_CONFIG_FORMID3_FORM;\r
-      } else {\r
-        LabelId = TLS_AUTH_CONFIG_FORMID4_FORM;\r
-      }\r
 \r
-      //\r
-      // Refresh selected file.\r
-      //\r
-      CleanUpPage (LabelId, Private);\r
-      break;\r
-    case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE:\r
-      //\r
-      // If the file is already opened, clean the file related resource first.\r
-      //\r
-      CleanFileContext (Private);\r
-\r
-      ChooseFile( NULL, NULL, UpdateCAFromFile, &File);\r
-      break;\r
+        if (QuestionId == KEY_TLS_AUTH_CONFIG_CLIENT_CERT) {\r
+          LabelId = TLS_AUTH_CONFIG_FORMID3_FORM;\r
+        } else {\r
+          LabelId = TLS_AUTH_CONFIG_FORMID4_FORM;\r
+        }\r
 \r
-    case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT:\r
-      Status = EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIABLE);\r
-      if (EFI_ERROR (Status)) {\r
+        //\r
+        // Refresh selected file.\r
+        //\r
+        CleanUpPage (LabelId, Private);\r
+        break;\r
+      case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE:\r
+        //\r
+        // If the file is already opened, clean the file related resource first.\r
+        //\r
         CleanFileContext (Private);\r
 \r
-        HiiPopUp->CreatePopup (\r
-          HiiPopUp,\r
-          EfiHiiPopupStyleError,\r
-          EfiHiiPopupTypeOk,\r
-          Private->RegisteredHandle,\r
-          STRING_TOKEN (STR_TLS_AUTH_ENROLL_CERT_FAILURE),\r
-          &PopUpSelect\r
-          );\r
-      }\r
-      break;\r
+        ChooseFile (NULL, NULL, UpdateCAFromFile, &File);\r
+        break;\r
 \r
-    case KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT:\r
-      CleanFileContext (Private);\r
+      case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT:\r
+        Status = EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIABLE);\r
+        if (EFI_ERROR (Status)) {\r
+          CleanFileContext (Private);\r
+\r
+          HiiPopUp->CreatePopup (\r
+                      HiiPopUp,\r
+                      EfiHiiPopupStyleError,\r
+                      EfiHiiPopupTypeOk,\r
+                      Private->RegisteredHandle,\r
+                      STRING_TOKEN (STR_TLS_AUTH_ENROLL_CERT_FAILURE),\r
+                      &PopUpSelect\r
+                      );\r
+        }\r
 \r
-      if (Private->CertGuid!= NULL) {\r
-        FreePool (Private->CertGuid);\r
-        Private->CertGuid = NULL;\r
-      }\r
-      break;\r
-\r
-    case KEY_TLS_AUTH_CONFIG_DELETE_CERT:\r
-      UpdateDeletePage (\r
-        Private,\r
-        EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
-        &gEfiTlsCaCertificateGuid,\r
-        LABEL_CA_DELETE,\r
-        TLS_AUTH_CONFIG_FORMID5_FORM,\r
-        OPTION_DEL_CA_ESTION_ID\r
-        );\r
-       break;\r
+        break;\r
+\r
+      case KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT:\r
+        CleanFileContext (Private);\r
 \r
-    default:\r
-      if ((QuestionId >= OPTION_DEL_CA_ESTION_ID) &&\r
-                 (QuestionId < (OPTION_DEL_CA_ESTION_ID + OPTION_CONFIG_RANGE)))  {\r
-        DeleteCert (\r
+        if (Private->CertGuid != NULL) {\r
+          FreePool (Private->CertGuid);\r
+          Private->CertGuid = NULL;\r
+        }\r
+\r
+        break;\r
+\r
+      case KEY_TLS_AUTH_CONFIG_DELETE_CERT:\r
+        UpdateDeletePage (\r
           Private,\r
           EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
           &gEfiTlsCaCertificateGuid,\r
           LABEL_CA_DELETE,\r
           TLS_AUTH_CONFIG_FORMID5_FORM,\r
-          OPTION_DEL_CA_ESTION_ID,\r
-          QuestionId - OPTION_DEL_CA_ESTION_ID\r
+          OPTION_DEL_CA_ESTION_ID\r
           );\r
-      }\r
-      break;\r
+        break;\r
+\r
+      default:\r
+        if ((QuestionId >= OPTION_DEL_CA_ESTION_ID) &&\r
+            (QuestionId < (OPTION_DEL_CA_ESTION_ID + OPTION_CONFIG_RANGE)))\r
+        {\r
+          DeleteCert (\r
+            Private,\r
+            EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
+            &gEfiTlsCaCertificateGuid,\r
+            LABEL_CA_DELETE,\r
+            TLS_AUTH_CONFIG_FORMID5_FORM,\r
+            OPTION_DEL_CA_ESTION_ID,\r
+            QuestionId - OPTION_DEL_CA_ESTION_ID\r
+            );\r
+        }\r
+\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (QuestionId) {\r
-    case KEY_TLS_AUTH_CONFIG_CERT_GUID:\r
-      ASSERT (Private->CertGuid != NULL);\r
-      RStatus = StrToGuid (\r
-                  IfrNvData->CertGuid,\r
-                  Private->CertGuid\r
-                  );\r
-      if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGTH] != L'\0')) {\r
-        Status = EFI_INVALID_PARAMETER;\r
-        break;\r
-      }\r
+      case KEY_TLS_AUTH_CONFIG_CERT_GUID:\r
+        ASSERT (Private->CertGuid != NULL);\r
+        RStatus = StrToGuid (\r
+                    IfrNvData->CertGuid,\r
+                    Private->CertGuid\r
+                    );\r
+        if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGTH] != L'\0')) {\r
+          Status = EFI_INVALID_PARAMETER;\r
+          break;\r
+        }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      break;\r
-    default:\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {\r
     CleanFileContext (Private);\r
@@ -1538,17 +1548,15 @@ EXIT:
 \r
   if (!EFI_ERROR (Status)) {\r
     BufferSize = sizeof (TLS_AUTH_CONFIG_IFR_NVDATA);\r
-    HiiSetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8*) IfrNvData, NULL);\r
+    HiiSetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, BufferSize, (UINT8 *)IfrNvData, NULL);\r
   }\r
 \r
   FreePool (IfrNvData);\r
 \r
-  if (File != NULL){\r
-    FreePool(File);\r
+  if (File != NULL) {\r
+    FreePool (File);\r
     File = NULL;\r
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
-\r