User: Defined PcdImageProtectionPolicy for ImageTool in audk, adopted…

… new API.
acidanthera · Nov 23, 2023 · 43c4931 · 43c4931 · vumanhcuongUET · Nov 23, 2023
1 parent 9cdf82a
commit 43c4931
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/Legacy/BootPlatform/EfiLdr/PeLoader.c b/Legacy/BootPlatform/EfiLdr/PeLoader.c
@@ -40,7 +40,8 @@ EfiLdrLoadImage (
              &ImageContext,
              FHand,
              BufferSize,
-             UEFI_IMAGE_SOURCE_NON_FV
+             UEFI_IMAGE_SOURCE_NON_FV,
+             UefiImageOriginFv
              );
   if (EFI_ERROR (Status)) {
     return Status;

diff --git a/Library/OcBootManagementLib/ImageLoader.c b/Library/OcBootManagementLib/ImageLoader.c
@@ -296,7 +296,8 @@ OcImageLoaderLoad (
                   &ImageContext,
                   SourceBuffer,
                   (UINT32)SourceSize,
-                  UEFI_IMAGE_SOURCE_FV
+                  UEFI_IMAGE_SOURCE_FV,
+                  UefiImageOriginFv
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCB: PeCoff init failure - %r\n", ImageStatus));

diff --git a/Library/OcPeCoffExtLib/OcPeCoffExtLib.c b/Library/OcPeCoffExtLib/OcPeCoffExtLib.c
@@ -466,7 +466,8 @@ PeCoffVerifyAppleSignature (
   ImageStatus = PeCoffInitializeContext (
                   &ImageContext,
                   PeImage,
-                  *ImageSize
+                  *ImageSize,
+                  UefiImageOriginFv
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCPE: PeCoff verify init failure - %r\n", ImageStatus));
@@ -561,7 +562,8 @@ PeCoffGetApfsDriverVersion (
   ImageStatus = PeCoffInitializeContext (
                   &ImageContext,
                   DriverBuffer,
-                  DriverSize
+                  DriverSize,
+                  UefiImageOriginFv
                   );
   if (EFI_ERROR (ImageStatus)) {
     DEBUG ((DEBUG_INFO, "OCPE: PeCoff apfs init failure - %r\n", ImageStatus));

diff --git a/User/Include/UserPcd.h b/User/Include/UserPcd.h
@@ -67,6 +67,7 @@ extern BOOLEAN  _gPcd_FeatureFlag_PcdFatReadOnlyMode;
 extern UINT32   _gPcd_BinaryPatch_PcdSerialRegisterStride;
 extern UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportNonFv;
 extern UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportFv;
+extern UINT32   _gPcd_FixedAtBuild_PcdImageProtectionPolicy;
 
 #define _PCD_GET_MODE_32_PcdUefiLibMaxPrintBufferSize   _gPcd_FixedAtBuild_PcdUefiLibMaxPrintBufferSize
 #define _PCD_GET_MODE_BOOL_PcdUgaConsumeSupport         _gPcd_FixedAtBuild_PcdUgaConsumeSupport
@@ -105,5 +106,6 @@ extern UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportFv;
 #define _PCD_GET_MODE_32_PcdImageLoaderRelocTypePolicy               _gPcd_FixedAtBuild_PcdImageLoaderRelocTypePolicy
 #define _PCD_GET_MODE_8_PcdUefiImageFormatSupportNonFv               _gPcd_FixedAtBuild_PcdUefiImageFormatSupportNonFv
 #define _PCD_GET_MODE_8_PcdUefiImageFormatSupportFv                  _gPcd_FixedAtBuild_PcdUefiImageFormatSupportFv
+#define _PCD_GET_MODE_32_PcdImageProtectionPolicy                    _gPcd_FixedAtBuild_PcdImageProtectionPolicy
 
 #endif // OC_USER_PCD_H
diff --git a/User/Library/UserPcd.c b/User/Library/UserPcd.c
@@ -50,3 +50,4 @@ BOOLEAN  _gPcd_FeatureFlag_PcdFatReadOnlyMode                        = _PCD_VALU
 UINT32   _gPcd_BinaryPatch_PcdSerialRegisterStride                   = 0;
 UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportNonFv           = 0x00;
 UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportFv              = 0x03;
+UINT32   _gPcd_FixedAtBuild_PcdImageProtectionPolicy                 = 0x00;
diff --git a/Utilities/AppleEfiSignTool/AppleEfiSignTool.c b/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
@@ -117,7 +117,8 @@ VerifySignatureAndApfs (
     ContextStatus = PeCoffInitializeContext (
                       &Context,
                       Image,
-                      ImageSize
+                      ImageSize,
+                      UefiImageOriginFv
                       );
   }
 

diff --git a/Utilities/TestPeCoff/PeCoff.c b/Utilities/TestPeCoff/PeCoff.c
@@ -200,7 +200,7 @@ PeCoffTestLoadFull (
   UINT32                        DestinationAlignment;
   UINT8                         HashContext;
 
-  Status = PeCoffInitializeContext (&Context, FileBuffer, FileSize);
+  Status = PeCoffInitializeContext (&Context, FileBuffer, FileSize, UefiImageOriginFv);
   if (EFI_ERROR (Status)) {
     return EFI_UNSUPPORTED;
   }