BaseTools: add capsule image header for auth FMP capsule file

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Capsule.py

diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py
index f8af12a7c27afbeabbc27f38bc01ab7797320d74..93ecee10c63f254e7bc5b71e6a3f1892c06f1a78 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -141,6 +141,7 @@ class Capsule (CapsuleClassObject) :
             Content.write(File.read())\r
             File.close()\r
         for fmp in self.FmpPayloadList:\r
+            Buffer = fmp.GenCapsuleSubItem()\r
             if fmp.Certificate_Guid:\r
                 ExternalTool, ExternalOption = FindExtendTool([], GenFdsGlobalVariable.ArchList, fmp.Certificate_Guid)\r
                 CmdOption = ''\r
@@ -161,7 +162,7 @@ class Capsule (CapsuleClassObject) :
                     dwLength = 4 + 2 + 2 + 16 + os.path.getsize(CapOutputTmp) - os.path.getsize(CapInputFile)\r
                 else:\r
                     dwLength = 4 + 2 + 2 + 16 + 16 + 256 + 256\r
-                Buffer  = pack('Q', fmp.MonotonicCount)\r
+                Buffer += pack('Q', fmp.MonotonicCount)\r
                 Buffer += pack('I', dwLength)\r
                 Buffer += pack('H', WIN_CERT_REVISION)\r
                 Buffer += pack('H', WIN_CERT_TYPE_EFI_GUID)\r
@@ -178,10 +179,16 @@ class Capsule (CapsuleClassObject) :
                     PreSize += len(Buffer)\r
                     Content.write(Buffer)\r
             else:\r
-                payload = fmp.GenCapsuleSubItem()\r
+                ImageFile = open(fmp.ImageFile, 'rb')\r
+                Buffer += ImageFile.read()\r
+                ImageFile.close()\r
+                if fmp.VendorCodeFile:\r
+                    VendorFile = open(fmp.VendorCodeFile, 'rb')\r
+                    Buffer += VendorFile.read()\r
+                    VendorFile.close()\r
                 FwMgrHdr.write(pack('=Q', PreSize))\r
-                PreSize += len(payload)\r
-                Content.write(payload)\r
+                PreSize += len(Buffer)\r
+                Content.write(Buffer)\r
         BodySize = len(FwMgrHdr.getvalue()) + len(Content.getvalue())\r
         Header.write(pack('=I', HdrSize + BodySize))\r
         #\r