## @file\r
# generate capsule\r
#\r
-# Copyright (c) 2007-2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007-2018, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
#\r
def GenCapsuleSubItem(self):\r
if self.FvName.find('.fv') == -1:\r
- if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
- FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName.upper())\r
+ if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
+ FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict[self.FvName.upper()]\r
FdBuffer = StringIO.StringIO('')\r
FvObj.CapsuleName = self.CapsuleName\r
FvFile = FvObj.AddToBuffer(FdBuffer)\r
#\r
def GenCapsuleSubItem(self):\r
if self.FdName.find('.fd') == -1:\r
- if self.FdName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
- FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict.get(self.FdName.upper())\r
+ if self.FdName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict:\r
+ FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[self.FdName.upper()]\r
FdFile = FdObj.GenFd()\r
return FdFile\r
else:\r
self.ImageTypeId = None\r
self.ImageIndex = None\r
self.HardwareInstance = None\r
- self.ImageFile = None\r
- self.VendorCodeFile = None\r
+ self.ImageFile = []\r
+ self.VendorCodeFile = []\r
self.Certificate_Guid = None\r
self.MonotonicCount = None\r
+ self.Existed = False\r
+ self.Buffer = None\r
\r
def GenCapsuleSubItem(self, AuthData=[]):\r
if not self.Version:\r
- self.Version = 0x00000002\r
+ self.Version = '0x00000002'\r
+ if not self.ImageIndex:\r
+ self.ImageIndex = '0x1'\r
+ if not self.HardwareInstance:\r
+ self.HardwareInstance = '0x0'\r
ImageFileSize = os.path.getsize(self.ImageFile)\r
if AuthData:\r
# the ImageFileSize need include the full authenticated info size. From first bytes of MonotonicCount to last bytes of certificate.\r
#\r
Guid = self.ImageTypeId.split('-')\r
Buffer = pack('=ILHHBBBBBBBBBBBBIIQ',\r
- int(self.Version,16),\r
+ int(self.Version, 16),\r
int(Guid[0], 16), \r
int(Guid[1], 16), \r
int(Guid[2], 16), \r
VendorFile = open(self.VendorCodeFile, 'rb')\r
Buffer += VendorFile.read()\r
VendorFile.close()\r
+ self.Existed = True\r
return Buffer\r