]> git.proxmox.com Git - mirror_edk2.git/blobdiff - SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
SignedCapsulePkg: Apply uncrustify changes
[mirror_edk2.git] / SignedCapsulePkg / Library / EdkiiSystemCapsuleLib / EdkiiSystemCapsuleLib.c
index 0f1444ba062ed2e4a8a0cb686beb88c00be994c3..d65d988c755abe14e1b89fb04ac0b6841c568bc4 100644 (file)
@@ -30,9 +30,9 @@
 \r
 #include <Protocol/FirmwareManagement.h>\r
 \r
-EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR   *mImageFmpInfo;\r
-UINTN                                    mImageFmpInfoSize;\r
-EFI_GUID                                 mEdkiiSystemFirmwareFileGuid;\r
+EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  *mImageFmpInfo;\r
+UINTN                                   mImageFmpInfoSize;\r
+EFI_GUID                                mEdkiiSystemFirmwareFileGuid;\r
 \r
 /**\r
   Check if a block of buffer is erased.\r
@@ -46,16 +46,16 @@ EFI_GUID                                 mEdkiiSystemFirmwareFileGuid;
 **/\r
 BOOLEAN\r
 IsBufferErased (\r
-  IN UINT8    ErasePolarity,\r
-  IN VOID     *InBuffer,\r
-  IN UINTN    BufferSize\r
+  IN UINT8  ErasePolarity,\r
+  IN VOID   *InBuffer,\r
+  IN UINTN  BufferSize\r
   )\r
 {\r
-  UINTN   Count;\r
-  UINT8   EraseByte;\r
-  UINT8   *Buffer;\r
+  UINTN  Count;\r
+  UINT8  EraseByte;\r
+  UINT8  *Buffer;\r
 \r
-  if(ErasePolarity == 1) {\r
+  if (ErasePolarity == 1) {\r
     EraseByte = 0xFF;\r
   } else {\r
     EraseByte = 0;\r
@@ -86,17 +86,17 @@ IsBufferErased (
 **/\r
 BOOLEAN\r
 GetSectionByType (\r
-  IN VOID                  *SectionBuffer,\r
-  IN UINT32                SectionBufferSize,\r
-  IN EFI_SECTION_TYPE      SectionType,\r
-  IN UINTN                 SectionInstance,\r
-  OUT VOID                 **OutSectionBuffer,\r
-  OUT UINTN                *OutSectionSize\r
+  IN VOID              *SectionBuffer,\r
+  IN UINT32            SectionBufferSize,\r
+  IN EFI_SECTION_TYPE  SectionType,\r
+  IN UINTN             SectionInstance,\r
+  OUT VOID             **OutSectionBuffer,\r
+  OUT UINTN            *OutSectionSize\r
   )\r
 {\r
-  EFI_COMMON_SECTION_HEADER             *SectionHeader;\r
-  UINTN                                 SectionSize;\r
-  UINTN                                 Instance;\r
+  EFI_COMMON_SECTION_HEADER  *SectionHeader;\r
+  UINTN                      SectionSize;\r
+  UINTN                      Instance;\r
 \r
   DEBUG ((DEBUG_INFO, "GetSectionByType - Buffer: 0x%08x - 0x%08x\n", SectionBuffer, SectionBufferSize));\r
 \r
@@ -108,20 +108,20 @@ GetSectionByType (
   Instance = 0;\r
   while ((UINTN)SectionHeader < (UINTN)SectionBuffer + SectionBufferSize) {\r
     DEBUG ((DEBUG_INFO, "GetSectionByType - Section: 0x%08x\n", SectionHeader));\r
-    if (IS_SECTION2(SectionHeader)) {\r
-      SectionSize = SECTION2_SIZE(SectionHeader);\r
+    if (IS_SECTION2 (SectionHeader)) {\r
+      SectionSize = SECTION2_SIZE (SectionHeader);\r
     } else {\r
-      SectionSize = SECTION_SIZE(SectionHeader);\r
+      SectionSize = SECTION_SIZE (SectionHeader);\r
     }\r
 \r
     if (SectionHeader->Type == SectionType) {\r
       if (Instance == SectionInstance) {\r
         *OutSectionBuffer = (UINT8 *)SectionHeader;\r
-        *OutSectionSize = SectionSize;\r
-        DEBUG((DEBUG_INFO, "GetSectionByType - 0x%x - 0x%x\n", *OutSectionBuffer, *OutSectionSize));\r
+        *OutSectionSize   = SectionSize;\r
+        DEBUG ((DEBUG_INFO, "GetSectionByType - 0x%x - 0x%x\n", *OutSectionBuffer, *OutSectionSize));\r
         return TRUE;\r
       } else {\r
-        DEBUG((DEBUG_INFO, "GetSectionByType - find section instance %x\n", Instance));\r
+        DEBUG ((DEBUG_INFO, "GetSectionByType - find section instance %x\n", Instance));\r
         Instance++;\r
       }\r
     } else {\r
@@ -134,7 +134,7 @@ GetSectionByType (
     //\r
     // Next Section\r
     //\r
-    SectionHeader = (EFI_COMMON_SECTION_HEADER *)((UINTN)SectionHeader + ALIGN_VALUE(SectionSize, 4));\r
+    SectionHeader = (EFI_COMMON_SECTION_HEADER *)((UINTN)SectionHeader + ALIGN_VALUE (SectionSize, 4));\r
   }\r
 \r
   return FALSE;\r
@@ -155,25 +155,25 @@ GetSectionByType (
 **/\r
 BOOLEAN\r
 GetFfsByName (\r
-  IN VOID                  *FdStart,\r
-  IN UINTN                 FdSize,\r
-  IN EFI_GUID              *FileName,\r
-  IN EFI_FV_FILETYPE       Type,\r
-  OUT VOID                 **OutFfsBuffer,\r
-  OUT UINTN                *OutFfsBufferSize\r
+  IN VOID             *FdStart,\r
+  IN UINTN            FdSize,\r
+  IN EFI_GUID         *FileName,\r
+  IN EFI_FV_FILETYPE  Type,\r
+  OUT VOID            **OutFfsBuffer,\r
+  OUT UINTN           *OutFfsBufferSize\r
   )\r
 {\r
-  UINTN                                     FvSize;\r
-  EFI_FIRMWARE_VOLUME_HEADER                *FvHeader;\r
-  EFI_FIRMWARE_VOLUME_EXT_HEADER            *FvExtHeader;\r
-  EFI_FFS_FILE_HEADER                       *FfsHeader;\r
-  UINT32                                    FfsSize;\r
-  UINTN                                     TestLength;\r
-  BOOLEAN                                   FvFound;\r
+  UINTN                           FvSize;\r
+  EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;\r
+  EFI_FIRMWARE_VOLUME_EXT_HEADER  *FvExtHeader;\r
+  EFI_FFS_FILE_HEADER             *FfsHeader;\r
+  UINT32                          FfsSize;\r
+  UINTN                           TestLength;\r
+  BOOLEAN                         FvFound;\r
 \r
   DEBUG ((DEBUG_INFO, "GetFfsByName - FV: 0x%08x - 0x%08x\n", (UINTN)FdStart, (UINTN)FdSize));\r
 \r
-  FvFound = FALSE;\r
+  FvFound  = FALSE;\r
   FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)FdStart;\r
   while ((UINTN)FvHeader < (UINTN)FdStart + FdSize - 1) {\r
     FvSize = (UINTN)FdStart + FdSize - (UINTN)FvHeader;\r
@@ -182,12 +182,14 @@ GetFfsByName (
       FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN)FvHeader + SIZE_4KB);\r
       continue;\r
     }\r
-    DEBUG((DEBUG_INFO, "checking FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));\r
+\r
+    DEBUG ((DEBUG_INFO, "checking FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));\r
     FvFound = TRUE;\r
     if (FvHeader->FvLength > FvSize) {\r
-      DEBUG((DEBUG_ERROR, "GetFfsByName - FvSize: 0x%08x, MaxSize - 0x%08x\n", (UINTN)FvHeader->FvLength, (UINTN)FvSize));\r
+      DEBUG ((DEBUG_ERROR, "GetFfsByName - FvSize: 0x%08x, MaxSize - 0x%08x\n", (UINTN)FvHeader->FvLength, (UINTN)FvSize));\r
       return FALSE;\r
     }\r
+\r
     FvSize = (UINTN)FvHeader->FvLength;\r
 \r
     //\r
@@ -195,44 +197,47 @@ GetFfsByName (
     //\r
     if (FvHeader->ExtHeaderOffset != 0) {\r
       FvExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *)((UINT8 *)FvHeader + FvHeader->ExtHeaderOffset);\r
-      FfsHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FvExtHeader + FvExtHeader->ExtHeaderSize);\r
+      FfsHeader   = (EFI_FFS_FILE_HEADER *)((UINT8 *)FvExtHeader + FvExtHeader->ExtHeaderSize);\r
     } else {\r
       FfsHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FvHeader + FvHeader->HeaderLength);\r
     }\r
-    FfsHeader = (EFI_FFS_FILE_HEADER *)((UINTN)FvHeader + ALIGN_VALUE((UINTN)FfsHeader - (UINTN)FvHeader, 8));\r
+\r
+    FfsHeader = (EFI_FFS_FILE_HEADER *)((UINTN)FvHeader + ALIGN_VALUE ((UINTN)FfsHeader - (UINTN)FvHeader, 8));\r
 \r
     while ((UINTN)FfsHeader < (UINTN)FvHeader + FvSize - 1) {\r
-      DEBUG((DEBUG_INFO, "GetFfsByName - FFS: 0x%08x\n", FfsHeader));\r
+      DEBUG ((DEBUG_INFO, "GetFfsByName - FFS: 0x%08x\n", FfsHeader));\r
       TestLength = (UINTN)((UINTN)FvHeader + FvSize - (UINTN)FfsHeader);\r
-      if (TestLength > sizeof(EFI_FFS_FILE_HEADER)) {\r
-        TestLength = sizeof(EFI_FFS_FILE_HEADER);\r
+      if (TestLength > sizeof (EFI_FFS_FILE_HEADER)) {\r
+        TestLength = sizeof (EFI_FFS_FILE_HEADER);\r
       }\r
-      if (IsBufferErased(1, FfsHeader, TestLength)) {\r
+\r
+      if (IsBufferErased (1, FfsHeader, TestLength)) {\r
         break;\r
       }\r
 \r
-      if (IS_FFS_FILE2(FfsHeader)) {\r
-        FfsSize = FFS_FILE2_SIZE(FfsHeader);\r
+      if (IS_FFS_FILE2 (FfsHeader)) {\r
+        FfsSize = FFS_FILE2_SIZE (FfsHeader);\r
       } else {\r
-        FfsSize = FFS_FILE_SIZE(FfsHeader);\r
+        FfsSize = FFS_FILE_SIZE (FfsHeader);\r
       }\r
 \r
-      if (CompareGuid(FileName, &FfsHeader->Name) &&\r
-          ((Type == EFI_FV_FILETYPE_ALL) || (FfsHeader->Type == Type))) {\r
-        *OutFfsBuffer = FfsHeader;\r
+      if (CompareGuid (FileName, &FfsHeader->Name) &&\r
+          ((Type == EFI_FV_FILETYPE_ALL) || (FfsHeader->Type == Type)))\r
+      {\r
+        *OutFfsBuffer     = FfsHeader;\r
         *OutFfsBufferSize = FfsSize;\r
         return TRUE;\r
       } else {\r
         //\r
         // Any other type is not allowed\r
         //\r
-        DEBUG((DEBUG_INFO, "GetFfsByName - other FFS type 0x%x, name %g\n", FfsHeader->Type, &FfsHeader->Name));\r
+        DEBUG ((DEBUG_INFO, "GetFfsByName - other FFS type 0x%x, name %g\n", FfsHeader->Type, &FfsHeader->Name));\r
       }\r
 \r
       //\r
       // Next File\r
       //\r
-      FfsHeader = (EFI_FFS_FILE_HEADER *)((UINTN)FfsHeader + ALIGN_VALUE(FfsSize, 8));\r
+      FfsHeader = (EFI_FFS_FILE_HEADER *)((UINTN)FfsHeader + ALIGN_VALUE (FfsSize, 8));\r
     }\r
 \r
     //\r
@@ -242,8 +247,9 @@ GetFfsByName (
   }\r
 \r
   if (!FvFound) {\r
-    DEBUG((DEBUG_ERROR, "GetFfsByName - NO FV Found\n"));\r
+    DEBUG ((DEBUG_ERROR, "GetFfsByName - NO FV Found\n"));\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -261,29 +267,30 @@ GetFfsByName (
 BOOLEAN\r
 EFIAPI\r
 ExtractDriverFvImage (\r
-  IN VOID                         *AuthenticatedImage,\r
-  IN UINTN                        AuthenticatedImageSize,\r
-  OUT VOID                        **DriverFvImage,\r
-  OUT UINTN                       *DriverFvImageSize\r
+  IN VOID    *AuthenticatedImage,\r
+  IN UINTN   AuthenticatedImageSize,\r
+  OUT VOID   **DriverFvImage,\r
+  OUT UINTN  *DriverFvImageSize\r
   )\r
 {\r
-  BOOLEAN     Result;\r
-  UINT32      FileHeaderSize;\r
+  BOOLEAN  Result;\r
+  UINT32   FileHeaderSize;\r
 \r
-  *DriverFvImage = NULL;\r
+  *DriverFvImage     = NULL;\r
   *DriverFvImageSize = 0;\r
 \r
-  Result = GetFfsByName(AuthenticatedImage, AuthenticatedImageSize, &gEdkiiSystemFmpCapsuleDriverFvFileGuid, EFI_FV_FILETYPE_RAW, DriverFvImage, DriverFvImageSize);\r
+  Result = GetFfsByName (AuthenticatedImage, AuthenticatedImageSize, &gEdkiiSystemFmpCapsuleDriverFvFileGuid, EFI_FV_FILETYPE_RAW, DriverFvImage, DriverFvImageSize);\r
   if (!Result) {\r
     return FALSE;\r
   }\r
 \r
-  if (IS_FFS_FILE2(*DriverFvImage)) {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER2);\r
+  if (IS_FFS_FILE2 (*DriverFvImage)) {\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER2);\r
   } else {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER);\r
   }\r
-  *DriverFvImage = (UINT8 *)*DriverFvImage + FileHeaderSize;\r
+\r
+  *DriverFvImage     = (UINT8 *)*DriverFvImage + FileHeaderSize;\r
   *DriverFvImageSize = *DriverFvImageSize - FileHeaderSize;\r
 \r
   return Result;\r
@@ -303,29 +310,30 @@ ExtractDriverFvImage (
 BOOLEAN\r
 EFIAPI\r
 ExtractConfigImage (\r
-  IN VOID                         *AuthenticatedImage,\r
-  IN UINTN                        AuthenticatedImageSize,\r
-  OUT VOID                        **ConfigImage,\r
-  OUT UINTN                       *ConfigImageSize\r
+  IN VOID    *AuthenticatedImage,\r
+  IN UINTN   AuthenticatedImageSize,\r
+  OUT VOID   **ConfigImage,\r
+  OUT UINTN  *ConfigImageSize\r
   )\r
 {\r
-  BOOLEAN     Result;\r
-  UINT32      FileHeaderSize;\r
+  BOOLEAN  Result;\r
+  UINT32   FileHeaderSize;\r
 \r
-  *ConfigImage = NULL;\r
+  *ConfigImage     = NULL;\r
   *ConfigImageSize = 0;\r
 \r
-  Result = GetFfsByName(AuthenticatedImage, AuthenticatedImageSize, &gEdkiiSystemFmpCapsuleConfigFileGuid, EFI_FV_FILETYPE_RAW, ConfigImage, ConfigImageSize);\r
+  Result = GetFfsByName (AuthenticatedImage, AuthenticatedImageSize, &gEdkiiSystemFmpCapsuleConfigFileGuid, EFI_FV_FILETYPE_RAW, ConfigImage, ConfigImageSize);\r
   if (!Result) {\r
     return FALSE;\r
   }\r
 \r
-  if (IS_FFS_FILE2(*ConfigImage)) {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER2);\r
+  if (IS_FFS_FILE2 (*ConfigImage)) {\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER2);\r
   } else {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER);\r
   }\r
-  *ConfigImage = (UINT8 *)*ConfigImage + FileHeaderSize;\r
+\r
+  *ConfigImage     = (UINT8 *)*ConfigImage + FileHeaderSize;\r
   *ConfigImageSize = *ConfigImageSize - FileHeaderSize;\r
 \r
   return Result;\r
@@ -348,20 +356,20 @@ ExtractConfigImage (
 BOOLEAN\r
 EFIAPI\r
 ExtractAuthenticatedImage (\r
-  IN VOID                         *Image,\r
-  IN UINTN                        ImageSize,\r
-  OUT UINT32                      *LastAttemptStatus,\r
-  OUT VOID                        **AuthenticatedImage,\r
-  OUT UINTN                       *AuthenticatedImageSize\r
+  IN VOID     *Image,\r
+  IN UINTN    ImageSize,\r
+  OUT UINT32  *LastAttemptStatus,\r
+  OUT VOID    **AuthenticatedImage,\r
+  OUT UINTN   *AuthenticatedImageSize\r
   )\r
 {\r
-  EFI_FIRMWARE_IMAGE_AUTHENTICATION         *ImageAuth;\r
-  EFI_STATUS                                Status;\r
-  GUID                                      *CertType;\r
-  VOID                                      *PublicKeyData;\r
-  UINTN                                     PublicKeyDataLength;\r
+  EFI_FIRMWARE_IMAGE_AUTHENTICATION  *ImageAuth;\r
+  EFI_STATUS                         Status;\r
+  GUID                               *CertType;\r
+  VOID                               *PublicKeyData;\r
+  UINTN                              PublicKeyDataLength;\r
 \r
-  DEBUG((DEBUG_INFO, "ExtractAuthenticatedImage - Image: 0x%08x - 0x%08x\n", (UINTN)Image, (UINTN)ImageSize));\r
+  DEBUG ((DEBUG_INFO, "ExtractAuthenticatedImage - Image: 0x%08x - 0x%08x\n", (UINTN)Image, (UINTN)ImageSize));\r
 \r
   *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
   if ((Image == NULL) || (ImageSize == 0)) {\r
@@ -369,82 +377,91 @@ ExtractAuthenticatedImage (
   }\r
 \r
   ImageAuth = (EFI_FIRMWARE_IMAGE_AUTHENTICATION *)Image;\r
-  if (ImageSize < sizeof(EFI_FIRMWARE_IMAGE_AUTHENTICATION)) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - ImageSize too small\n"));\r
+  if (ImageSize < sizeof (EFI_FIRMWARE_IMAGE_AUTHENTICATION)) {\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - ImageSize too small\n"));\r
     return FALSE;\r
   }\r
-  if (ImageAuth->AuthInfo.Hdr.dwLength <= OFFSET_OF(WIN_CERTIFICATE_UEFI_GUID, CertData)) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - dwLength too small\n"));\r
+\r
+  if (ImageAuth->AuthInfo.Hdr.dwLength <= OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData)) {\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - dwLength too small\n"));\r
     return FALSE;\r
   }\r
-  if ((UINTN) ImageAuth->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - dwLength too big\n"));\r
+\r
+  if ((UINTN)ImageAuth->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof (UINT64)) {\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - dwLength too big\n"));\r
     return FALSE;\r
   }\r
-  if (ImageSize <= sizeof(ImageAuth->MonotonicCount) + ImageAuth->AuthInfo.Hdr.dwLength) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - ImageSize too small\n"));\r
+\r
+  if (ImageSize <= sizeof (ImageAuth->MonotonicCount) + ImageAuth->AuthInfo.Hdr.dwLength) {\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - ImageSize too small\n"));\r
     return FALSE;\r
   }\r
+\r
   if (ImageAuth->AuthInfo.Hdr.wRevision != 0x0200) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - wRevision: 0x%02x, expect - 0x%02x\n", (UINTN)ImageAuth->AuthInfo.Hdr.wRevision, (UINTN)0x0200));\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - wRevision: 0x%02x, expect - 0x%02x\n", (UINTN)ImageAuth->AuthInfo.Hdr.wRevision, (UINTN)0x0200));\r
     return FALSE;\r
   }\r
+\r
   if (ImageAuth->AuthInfo.Hdr.wCertificateType != WIN_CERT_TYPE_EFI_GUID) {\r
-    DEBUG((DEBUG_ERROR, "ExtractAuthenticatedImage - wCertificateType: 0x%02x, expect - 0x%02x\n", (UINTN)ImageAuth->AuthInfo.Hdr.wCertificateType, (UINTN)WIN_CERT_TYPE_EFI_GUID));\r
+    DEBUG ((DEBUG_ERROR, "ExtractAuthenticatedImage - wCertificateType: 0x%02x, expect - 0x%02x\n", (UINTN)ImageAuth->AuthInfo.Hdr.wCertificateType, (UINTN)WIN_CERT_TYPE_EFI_GUID));\r
     return FALSE;\r
   }\r
 \r
   CertType = &ImageAuth->AuthInfo.CertType;\r
-  DEBUG((DEBUG_INFO, "ExtractAuthenticatedImage - CertType: %g\n", CertType));\r
-\r
-  if (CompareGuid(&gEfiCertPkcs7Guid, CertType)) {\r
-    PublicKeyData   = PcdGetPtr(PcdPkcs7CertBuffer);\r
-    PublicKeyDataLength = PcdGetSize(PcdPkcs7CertBuffer);\r
-  } else if (CompareGuid(&gEfiCertTypeRsa2048Sha256Guid, CertType)) {\r
-    PublicKeyData = PcdGetPtr(PcdRsa2048Sha256PublicKeyBuffer);\r
-    PublicKeyDataLength = PcdGetSize(PcdRsa2048Sha256PublicKeyBuffer);\r
+  DEBUG ((DEBUG_INFO, "ExtractAuthenticatedImage - CertType: %g\n", CertType));\r
+\r
+  if (CompareGuid (&gEfiCertPkcs7Guid, CertType)) {\r
+    PublicKeyData       = PcdGetPtr (PcdPkcs7CertBuffer);\r
+    PublicKeyDataLength = PcdGetSize (PcdPkcs7CertBuffer);\r
+  } else if (CompareGuid (&gEfiCertTypeRsa2048Sha256Guid, CertType)) {\r
+    PublicKeyData       = PcdGetPtr (PcdRsa2048Sha256PublicKeyBuffer);\r
+    PublicKeyDataLength = PcdGetSize (PcdRsa2048Sha256PublicKeyBuffer);\r
   } else {\r
     return FALSE;\r
   }\r
+\r
   ASSERT (PublicKeyData != NULL);\r
   ASSERT (PublicKeyDataLength != 0);\r
 \r
-  Status = AuthenticateFmpImage(\r
+  Status = AuthenticateFmpImage (\r
              ImageAuth,\r
              ImageSize,\r
              PublicKeyData,\r
              PublicKeyDataLength\r
              );\r
   switch (Status) {\r
-  case RETURN_SUCCESS:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_SUCCESS;\r
-    break;\r
-  case RETURN_SECURITY_VIOLATION:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_AUTH_ERROR;\r
-    break;\r
-  case RETURN_INVALID_PARAMETER:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
-    break;\r
-  case RETURN_UNSUPPORTED:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
-    break;\r
-  case RETURN_OUT_OF_RESOURCES:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INSUFFICIENT_RESOURCES;\r
-    break;\r
-  default:\r
-    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;\r
-    break;\r
-  }\r
-  if (EFI_ERROR(Status)) {\r
+    case RETURN_SUCCESS:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_SUCCESS;\r
+      break;\r
+    case RETURN_SECURITY_VIOLATION:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_AUTH_ERROR;\r
+      break;\r
+    case RETURN_INVALID_PARAMETER:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
+      break;\r
+    case RETURN_UNSUPPORTED:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
+      break;\r
+    case RETURN_OUT_OF_RESOURCES:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INSUFFICIENT_RESOURCES;\r
+      break;\r
+    default:\r
+      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;\r
+      break;\r
+  }\r
+\r
+  if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
 \r
   if (AuthenticatedImage != NULL) {\r
-    *AuthenticatedImage = (UINT8 *)ImageAuth + ImageAuth->AuthInfo.Hdr.dwLength + sizeof(ImageAuth->MonotonicCount);\r
+    *AuthenticatedImage = (UINT8 *)ImageAuth + ImageAuth->AuthInfo.Hdr.dwLength + sizeof (ImageAuth->MonotonicCount);\r
   }\r
+\r
   if (AuthenticatedImageSize != NULL) {\r
-    *AuthenticatedImageSize = ImageSize - ImageAuth->AuthInfo.Hdr.dwLength - sizeof(ImageAuth->MonotonicCount);\r
+    *AuthenticatedImageSize = ImageSize - ImageAuth->AuthInfo.Hdr.dwLength - sizeof (ImageAuth->MonotonicCount);\r
   }\r
+\r
   return TRUE;\r
 }\r
 \r
@@ -462,41 +479,45 @@ ExtractAuthenticatedImage (
 BOOLEAN\r
 EFIAPI\r
 ExtractSystemFirmwareImageFmpInfo (\r
-  IN VOID                                      *SystemFirmwareImage,\r
-  IN UINTN                                     SystemFirmwareImageSize,\r
-  OUT EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR   **ImageFmpInfo,\r
-  OUT UINTN                                    *ImageFmpInfoSize\r
+  IN VOID                                     *SystemFirmwareImage,\r
+  IN UINTN                                    SystemFirmwareImageSize,\r
+  OUT EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  **ImageFmpInfo,\r
+  OUT UINTN                                   *ImageFmpInfoSize\r
   )\r
 {\r
-  BOOLEAN     Result;\r
-  UINT32      SectionHeaderSize;\r
-  UINT32      FileHeaderSize;\r
+  BOOLEAN  Result;\r
+  UINT32   SectionHeaderSize;\r
+  UINT32   FileHeaderSize;\r
 \r
-  *ImageFmpInfo = NULL;\r
+  *ImageFmpInfo     = NULL;\r
   *ImageFmpInfoSize = 0;\r
 \r
-  Result = GetFfsByName(SystemFirmwareImage, SystemFirmwareImageSize, &gEdkiiSystemFirmwareImageDescriptorFileGuid, EFI_FV_FILETYPE_ALL, (VOID **)ImageFmpInfo, ImageFmpInfoSize);\r
+  Result = GetFfsByName (SystemFirmwareImage, SystemFirmwareImageSize, &gEdkiiSystemFirmwareImageDescriptorFileGuid, EFI_FV_FILETYPE_ALL, (VOID **)ImageFmpInfo, ImageFmpInfoSize);\r
   if (!Result) {\r
     return FALSE;\r
   }\r
+\r
   if (IS_FFS_FILE2 (*ImageFmpInfo)) {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER2);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER2);\r
   } else {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER);\r
   }\r
-  *ImageFmpInfo = (VOID *)((UINT8 *)*ImageFmpInfo + FileHeaderSize);\r
+\r
+  *ImageFmpInfo     = (VOID *)((UINT8 *)*ImageFmpInfo + FileHeaderSize);\r
   *ImageFmpInfoSize = *ImageFmpInfoSize - FileHeaderSize;\r
 \r
-  Result = GetSectionByType(*ImageFmpInfo, (UINT32)*ImageFmpInfoSize, EFI_SECTION_RAW, 0, (VOID **)ImageFmpInfo, ImageFmpInfoSize);\r
+  Result = GetSectionByType (*ImageFmpInfo, (UINT32)*ImageFmpInfoSize, EFI_SECTION_RAW, 0, (VOID **)ImageFmpInfo, ImageFmpInfoSize);\r
   if (!Result) {\r
     return FALSE;\r
   }\r
-  if (IS_SECTION2(*ImageFmpInfo)) {\r
-    SectionHeaderSize = sizeof(EFI_RAW_SECTION2);\r
+\r
+  if (IS_SECTION2 (*ImageFmpInfo)) {\r
+    SectionHeaderSize = sizeof (EFI_RAW_SECTION2);\r
   } else {\r
-    SectionHeaderSize = sizeof(EFI_RAW_SECTION);\r
+    SectionHeaderSize = sizeof (EFI_RAW_SECTION);\r
   }\r
-  *ImageFmpInfo = (VOID *)((UINT8 *)*ImageFmpInfo + SectionHeaderSize);\r
+\r
+  *ImageFmpInfo     = (VOID *)((UINT8 *)*ImageFmpInfo + SectionHeaderSize);\r
   *ImageFmpInfoSize = *ImageFmpInfoSize - SectionHeaderSize;\r
 \r
   return TRUE;\r
@@ -516,32 +537,34 @@ ExtractSystemFirmwareImageFmpInfo (
 BOOLEAN\r
 EFIAPI\r
 ExtractSystemFirmwareImage (\r
-  IN VOID                         *AuthenticatedImage,\r
-  IN UINTN                        AuthenticatedImageSize,\r
-  OUT VOID                        **SystemFirmwareImage,\r
-  OUT UINTN                       *SystemFirmwareImageSize\r
+  IN VOID    *AuthenticatedImage,\r
+  IN UINTN   AuthenticatedImageSize,\r
+  OUT VOID   **SystemFirmwareImage,\r
+  OUT UINTN  *SystemFirmwareImageSize\r
   )\r
 {\r
-  BOOLEAN     Result;\r
-  UINT32      FileHeaderSize;\r
+  BOOLEAN  Result;\r
+  UINT32   FileHeaderSize;\r
 \r
-  *SystemFirmwareImage = NULL;\r
+  *SystemFirmwareImage     = NULL;\r
   *SystemFirmwareImageSize = 0;\r
 \r
-  Result = GetFfsByName(AuthenticatedImage, AuthenticatedImageSize, &mEdkiiSystemFirmwareFileGuid, EFI_FV_FILETYPE_RAW, SystemFirmwareImage, SystemFirmwareImageSize);\r
+  Result = GetFfsByName (AuthenticatedImage, AuthenticatedImageSize, &mEdkiiSystemFirmwareFileGuid, EFI_FV_FILETYPE_RAW, SystemFirmwareImage, SystemFirmwareImageSize);\r
   if (!Result) {\r
     // no nested FV, just return all data.\r
-    *SystemFirmwareImage = AuthenticatedImage;\r
+    *SystemFirmwareImage     = AuthenticatedImage;\r
     *SystemFirmwareImageSize = AuthenticatedImageSize;\r
 \r
     return TRUE;\r
   }\r
+\r
   if (IS_FFS_FILE2 (*SystemFirmwareImage)) {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER2);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER2);\r
   } else {\r
-    FileHeaderSize = sizeof(EFI_FFS_FILE_HEADER);\r
+    FileHeaderSize = sizeof (EFI_FFS_FILE_HEADER);\r
   }\r
-  *SystemFirmwareImage = (UINT8 *)*SystemFirmwareImage + FileHeaderSize;\r
+\r
+  *SystemFirmwareImage     = (UINT8 *)*SystemFirmwareImage + FileHeaderSize;\r
   *SystemFirmwareImageSize = *SystemFirmwareImageSize - FileHeaderSize;\r
 \r
   return Result;\r
@@ -568,22 +591,22 @@ ExtractSystemFirmwareImage (
 EFI_STATUS\r
 EFIAPI\r
 CapsuleAuthenticateSystemFirmware (\r
-  IN VOID                         *Image,\r
-  IN UINTN                        ImageSize,\r
-  IN BOOLEAN                      ForceVersionMatch,\r
-  OUT UINT32                      *LastAttemptVersion,\r
-  OUT UINT32                      *LastAttemptStatus,\r
-  OUT VOID                        **AuthenticatedImage,\r
-  OUT UINTN                       *AuthenticatedImageSize\r
+  IN VOID     *Image,\r
+  IN UINTN    ImageSize,\r
+  IN BOOLEAN  ForceVersionMatch,\r
+  OUT UINT32  *LastAttemptVersion,\r
+  OUT UINT32  *LastAttemptStatus,\r
+  OUT VOID    **AuthenticatedImage,\r
+  OUT UINTN   *AuthenticatedImageSize\r
   )\r
 {\r
-  BOOLEAN                                  Result;\r
-  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR   *ImageFmpInfo;\r
-  UINTN                                    ImageFmpInfoSize;\r
-  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR   *CurrentImageFmpInfo;\r
-  UINTN                                    CurrentImageFmpInfoSize;\r
-  VOID                                     *SystemFirmwareImage;\r
-  UINTN                                    SystemFirmwareImageSize;\r
+  BOOLEAN                                 Result;\r
+  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  *ImageFmpInfo;\r
+  UINTN                                   ImageFmpInfoSize;\r
+  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  *CurrentImageFmpInfo;\r
+  UINTN                                   CurrentImageFmpInfoSize;\r
+  VOID                                    *SystemFirmwareImage;\r
+  UINTN                                   SystemFirmwareImageSize;\r
 \r
   *LastAttemptVersion = 0;\r
 \r
@@ -592,55 +615,56 @@ CapsuleAuthenticateSystemFirmware (
   // Do not touch FMP protocol and its private structure.\r
   //\r
   if (mImageFmpInfo == NULL) {\r
-    DEBUG((DEBUG_INFO, "ImageFmpInfo is not set\n"));\r
+    DEBUG ((DEBUG_INFO, "ImageFmpInfo is not set\n"));\r
     return EFI_SECURITY_VIOLATION;\r
   }\r
 \r
-  Result = ExtractAuthenticatedImage((VOID *)Image, ImageSize, LastAttemptStatus, AuthenticatedImage, AuthenticatedImageSize);\r
+  Result = ExtractAuthenticatedImage ((VOID *)Image, ImageSize, LastAttemptStatus, AuthenticatedImage, AuthenticatedImageSize);\r
   if (!Result) {\r
-    DEBUG((DEBUG_INFO, "ExtractAuthenticatedImage - fail\n"));\r
+    DEBUG ((DEBUG_INFO, "ExtractAuthenticatedImage - fail\n"));\r
     return EFI_SECURITY_VIOLATION;\r
   }\r
 \r
-  DEBUG((DEBUG_INFO, "AuthenticatedImage - 0x%x - 0x%x\n", *AuthenticatedImage, *AuthenticatedImageSize));\r
+  DEBUG ((DEBUG_INFO, "AuthenticatedImage - 0x%x - 0x%x\n", *AuthenticatedImage, *AuthenticatedImageSize));\r
 \r
-  Result = ExtractSystemFirmwareImage(*AuthenticatedImage, *AuthenticatedImageSize, &SystemFirmwareImage, &SystemFirmwareImageSize);\r
+  Result = ExtractSystemFirmwareImage (*AuthenticatedImage, *AuthenticatedImageSize, &SystemFirmwareImage, &SystemFirmwareImageSize);\r
   if (!Result) {\r
     *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
-    DEBUG((DEBUG_INFO, "ExtractSystemFirmwareImage - fail\n"));\r
+    DEBUG ((DEBUG_INFO, "ExtractSystemFirmwareImage - fail\n"));\r
     return EFI_SECURITY_VIOLATION;\r
   }\r
-  DEBUG((DEBUG_INFO, "SystemFirmwareImage - 0x%x - 0x%x\n", SystemFirmwareImage, SystemFirmwareImageSize));\r
 \r
-  Result = ExtractSystemFirmwareImageFmpInfo(SystemFirmwareImage, SystemFirmwareImageSize, &ImageFmpInfo, &ImageFmpInfoSize);\r
+  DEBUG ((DEBUG_INFO, "SystemFirmwareImage - 0x%x - 0x%x\n", SystemFirmwareImage, SystemFirmwareImageSize));\r
+\r
+  Result = ExtractSystemFirmwareImageFmpInfo (SystemFirmwareImage, SystemFirmwareImageSize, &ImageFmpInfo, &ImageFmpInfoSize);\r
   if (!Result) {\r
     *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;\r
-    DEBUG((DEBUG_INFO, "ExtractSystemFirmwareImageFmpInfo - fail\n"));\r
+    DEBUG ((DEBUG_INFO, "ExtractSystemFirmwareImageFmpInfo - fail\n"));\r
     return EFI_SECURITY_VIOLATION;\r
   }\r
 \r
   *LastAttemptVersion = ImageFmpInfo->Version;\r
-  DEBUG((DEBUG_INFO, "ImageFmpInfo - 0x%x - 0x%x\n", ImageFmpInfo, ImageFmpInfoSize));\r
-  DEBUG((DEBUG_INFO, "NewImage Version - 0x%x\n", ImageFmpInfo->Version));\r
-  DEBUG((DEBUG_INFO, "NewImage LowestSupportedImageVersion - 0x%x\n", ImageFmpInfo->LowestSupportedImageVersion));\r
+  DEBUG ((DEBUG_INFO, "ImageFmpInfo - 0x%x - 0x%x\n", ImageFmpInfo, ImageFmpInfoSize));\r
+  DEBUG ((DEBUG_INFO, "NewImage Version - 0x%x\n", ImageFmpInfo->Version));\r
+  DEBUG ((DEBUG_INFO, "NewImage LowestSupportedImageVersion - 0x%x\n", ImageFmpInfo->LowestSupportedImageVersion));\r
 \r
-  CurrentImageFmpInfo = mImageFmpInfo;\r
+  CurrentImageFmpInfo     = mImageFmpInfo;\r
   CurrentImageFmpInfoSize = mImageFmpInfoSize;\r
 \r
-  DEBUG((DEBUG_INFO, "ImageFmpInfo - 0x%x - 0x%x\n", CurrentImageFmpInfo, CurrentImageFmpInfoSize));\r
-  DEBUG((DEBUG_INFO, "Current Version - 0x%x\n", CurrentImageFmpInfo->Version));\r
-  DEBUG((DEBUG_INFO, "Current LowestSupportedImageVersion - 0x%x\n", CurrentImageFmpInfo->LowestSupportedImageVersion));\r
+  DEBUG ((DEBUG_INFO, "ImageFmpInfo - 0x%x - 0x%x\n", CurrentImageFmpInfo, CurrentImageFmpInfoSize));\r
+  DEBUG ((DEBUG_INFO, "Current Version - 0x%x\n", CurrentImageFmpInfo->Version));\r
+  DEBUG ((DEBUG_INFO, "Current LowestSupportedImageVersion - 0x%x\n", CurrentImageFmpInfo->LowestSupportedImageVersion));\r
 \r
   if (ForceVersionMatch) {\r
     if (CurrentImageFmpInfo->Version != ImageFmpInfo->Version) {\r
       *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INCORRECT_VERSION;\r
-      DEBUG((DEBUG_INFO, "ForceVersionMatch check - fail\n"));\r
+      DEBUG ((DEBUG_INFO, "ForceVersionMatch check - fail\n"));\r
       return EFI_SECURITY_VIOLATION;\r
     }\r
   } else {\r
     if (ImageFmpInfo->Version < CurrentImageFmpInfo->LowestSupportedImageVersion) {\r
       *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INCORRECT_VERSION;\r
-      DEBUG((DEBUG_INFO, "LowestSupportedImageVersion check - fail\n"));\r
+      DEBUG ((DEBUG_INFO, "LowestSupportedImageVersion check - fail\n"));\r
       return EFI_SECURITY_VIOLATION;\r
     }\r
   }\r
@@ -661,17 +685,18 @@ CapsuleAuthenticateSystemFirmware (
 VOID\r
 EFIAPI\r
 EdkiiSystemCapsuleLibPcdCallBack (\r
-  IN        CONST GUID        *CallBackGuid  OPTIONAL,\r
-  IN        UINTN             CallBackToken,\r
-  IN  OUT   VOID              *TokenData,\r
-  IN        UINTN             TokenDataSize\r
+  IN        CONST GUID  *CallBackGuid  OPTIONAL,\r
+  IN        UINTN       CallBackToken,\r
+  IN  OUT   VOID        *TokenData,\r
+  IN        UINTN       TokenDataSize\r
   )\r
 {\r
   if (CompareGuid (CallBackGuid, &gEfiSignedCapsulePkgTokenSpaceGuid) &&\r
-      CallBackToken == PcdToken (PcdEdkiiSystemFirmwareImageDescriptor)) {\r
+      (CallBackToken == PcdToken (PcdEdkiiSystemFirmwareImageDescriptor)))\r
+  {\r
     mImageFmpInfoSize = TokenDataSize;\r
-    mImageFmpInfo = AllocateCopyPool (mImageFmpInfoSize, TokenData);\r
-    ASSERT(mImageFmpInfo != NULL);\r
+    mImageFmpInfo     = AllocateCopyPool (mImageFmpInfoSize, TokenData);\r
+    ASSERT (mImageFmpInfo != NULL);\r
     //\r
     // Cancel Callback after get the real set value\r
     //\r
@@ -683,8 +708,9 @@ EdkiiSystemCapsuleLibPcdCallBack (
   }\r
 \r
   if (CompareGuid (CallBackGuid, &gEfiSignedCapsulePkgTokenSpaceGuid) &&\r
-      CallBackToken == PcdToken (PcdEdkiiSystemFirmwareFileGuid)) {\r
-    CopyGuid(&mEdkiiSystemFirmwareFileGuid, TokenData);\r
+      (CallBackToken == PcdToken (PcdEdkiiSystemFirmwareFileGuid)))\r
+  {\r
+    CopyGuid (&mEdkiiSystemFirmwareFileGuid, TokenData);\r
     //\r
     // Cancel Callback after get the real set value\r
     //\r
@@ -707,13 +733,14 @@ EdkiiSystemCapsuleLibConstructor (
   VOID\r
   )\r
 {\r
-  mImageFmpInfoSize = PcdGetSize(PcdEdkiiSystemFirmwareImageDescriptor);\r
-  mImageFmpInfo     = PcdGetPtr(PcdEdkiiSystemFirmwareImageDescriptor);\r
+  mImageFmpInfoSize = PcdGetSize (PcdEdkiiSystemFirmwareImageDescriptor);\r
+  mImageFmpInfo     = PcdGetPtr (PcdEdkiiSystemFirmwareImageDescriptor);\r
   //\r
   // Verify Firmware Image Descriptor first\r
   //\r
-  if (mImageFmpInfoSize < sizeof (EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR) ||\r
-      mImageFmpInfo->Signature != EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR_SIGNATURE) {\r
+  if ((mImageFmpInfoSize < sizeof (EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR)) ||\r
+      (mImageFmpInfo->Signature != EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR_SIGNATURE))\r
+  {\r
     //\r
     // SystemFirmwareImageDescriptor is not set.\r
     // Register PCD set callback to hook PCD value set.\r
@@ -727,10 +754,10 @@ EdkiiSystemCapsuleLibConstructor (
       );\r
   } else {\r
     mImageFmpInfo = AllocateCopyPool (mImageFmpInfoSize, mImageFmpInfo);\r
-    ASSERT(mImageFmpInfo != NULL);\r
+    ASSERT (mImageFmpInfo != NULL);\r
   }\r
 \r
-  CopyGuid(&mEdkiiSystemFirmwareFileGuid, PcdGetPtr(PcdEdkiiSystemFirmwareFileGuid));\r
+  CopyGuid (&mEdkiiSystemFirmwareFileGuid, PcdGetPtr (PcdEdkiiSystemFirmwareFileGuid));\r
   //\r
   // Verify GUID value first\r
   //\r
@@ -741,5 +768,6 @@ EdkiiSystemCapsuleLibConstructor (
       EdkiiSystemCapsuleLibPcdCallBack\r
       );\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r