--- /dev/null
+## @file\r
+# OBJCOPY parser, it's used to replace FV\r
+#\r
+# Copyright (c) 2023, Intel Corporation. All rights reserved.<BR>\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
+##\r
+\r
+import argparse\r
+from ctypes import *\r
+import struct\r
+\r
+class ElfSectionHeader64:\r
+ def __init__(self, sh_name, sh_type, sh_flags, sh_addr, sh_offset, sh_size, sh_link, sh_info, sh_addralign, sh_entsize):\r
+ self.sh_name = sh_name\r
+ self.sh_type = sh_type\r
+ self.sh_flags = sh_flags\r
+ self.sh_addr = sh_addr\r
+ self.sh_offset = sh_offset\r
+ self.sh_size = sh_size\r
+ self.sh_link = sh_link\r
+ self.sh_info = sh_info\r
+ self.sh_addralign = sh_addralign\r
+ self.sh_entsize = sh_entsize\r
+\r
+ def pack(self):\r
+ return struct.pack('<IIQQQQIIQQ', self.sh_name, self.sh_type, self.sh_flags, self.sh_addr, self.sh_offset, self.sh_size, self.sh_link, self.sh_info, self.sh_addralign, self.sh_entsize)\r
+\r
+ @classmethod\r
+ def unpack(cls, data):\r
+ unpacked_data = struct.unpack('<IIQQQQIIQQ', data)\r
+ return cls(*unpacked_data)\r
+\r
+class ElfHeader64:\r
+ def __init__(self, data):\r
+ # Parse the ELF identification bytes\r
+ self.e_ident = struct.unpack('16s', data[:16])[0]\r
+ self.e_type = struct.unpack('H', data[16:18])[0]\r
+ self.e_machine = struct.unpack('H', data[18:20])[0]\r
+ self.e_version = struct.unpack('I', data[20:24])[0]\r
+ self.e_entry = struct.unpack('Q', data[24:32])[0]\r
+ self.e_phoff = struct.unpack('Q', data[32:40])[0]\r
+ self.e_shoff = struct.unpack('Q', data[40:48])[0]\r
+ self.e_flags = struct.unpack('I', data[48:52])[0]\r
+ self.e_ehsize = struct.unpack('H', data[52:54])[0]\r
+ self.e_phentsize = struct.unpack('H', data[54:56])[0]\r
+ self.e_phnum = struct.unpack('H', data[56:58])[0]\r
+ self.e_shentsize = struct.unpack('H', data[58:60])[0]\r
+ self.e_shnum = struct.unpack('H', data[60:62])[0]\r
+ self.e_shstrndx = struct.unpack('H', data[62:64])[0]\r
+\r
+ def pack(self):\r
+ # Pack the ELF header data into a binary string\r
+ data = b''\r
+ data += struct.pack('16s', self.e_ident)\r
+ data += struct.pack('H', self.e_type)\r
+ data += struct.pack('H', self.e_machine)\r
+ data += struct.pack('I', self.e_version)\r
+ data += struct.pack('Q', self.e_entry)\r
+ data += struct.pack('Q', self.e_phoff)\r
+ data += struct.pack('Q', self.e_shoff)\r
+ data += struct.pack('I', self.e_flags)\r
+ data += struct.pack('H', self.e_ehsize)\r
+ data += struct.pack('H', self.e_phentsize)\r
+ data += struct.pack('H', self.e_phnum)\r
+ data += struct.pack('H', self.e_shentsize)\r
+ data += struct.pack('H', self.e_shnum)\r
+ data += struct.pack('H', self.e_shstrndx)\r
+ return data\r
+\r
+class Elf64_Phdr:\r
+ def __init__(self, data):\r
+ self.p_type = struct.unpack("<L", data[0:4])[0]\r
+ self.p_flags = struct.unpack("<L", data[4:8])[0]\r
+ self.p_offset = struct.unpack("<Q", data[8:16])[0]\r
+ self.p_vaddr = struct.unpack("<Q", data[16:24])[0]\r
+ self.p_paddr = struct.unpack("<Q", data[24:32])[0]\r
+ self.p_filesz = struct.unpack("<Q", data[32:40])[0]\r
+ self.p_memsz = struct.unpack("<Q", data[40:48])[0]\r
+ self.p_align = struct.unpack("<Q", data[48:56])[0]\r
+\r
+ def pack(self):\r
+ # Pack the Program header table into a binary string\r
+ data = b''\r
+ data += struct.pack('<L', self.p_type)\r
+ data += struct.pack('<L', self.p_flags)\r
+ data += struct.pack('<Q', self.p_offset)\r
+ data += struct.pack('<Q', self.p_vaddr)\r
+ data += struct.pack('<Q', self.p_paddr)\r
+ data += struct.pack('<Q', self.p_filesz)\r
+ data += struct.pack('<Q', self.p_memsz)\r
+ data += struct.pack('<Q', self.p_align)\r
+ return data\r
+\r
+class ElfSectionHeader32:\r
+ def __init__(self, sh_name, sh_type, sh_flags, sh_addr, sh_offset, sh_size, sh_link, sh_info, sh_addralign, sh_entsize):\r
+ self.sh_name = sh_name\r
+ self.sh_type = sh_type\r
+ self.sh_flags = sh_flags\r
+ self.sh_addr = sh_addr\r
+ self.sh_offset = sh_offset\r
+ self.sh_size = sh_size\r
+ self.sh_link = sh_link\r
+ self.sh_info = sh_info\r
+ self.sh_addralign = sh_addralign\r
+ self.sh_entsize = sh_entsize\r
+\r
+ def pack(self):\r
+ return struct.pack('<IIIIIIIIII', self.sh_name, self.sh_type, self.sh_flags, self.sh_addr, self.sh_offset, self.sh_size, self.sh_link, self.sh_info, self.sh_addralign, self.sh_entsize)\r
+\r
+ @classmethod\r
+ def unpack(cls, data):\r
+ unpacked_data = struct.unpack('<IIIIIIIIII', data)\r
+ return cls(*unpacked_data)\r
+\r
+class ElfHeader32:\r
+ def __init__(self, data):\r
+ # Parse the ELF identification bytes\r
+ self.e_ident = struct.unpack('16s', data[:16])[0]\r
+ self.e_type = struct.unpack('H', data[16:18])[0]\r
+ self.e_machine = struct.unpack('H', data[18:20])[0]\r
+ self.e_version = struct.unpack('I', data[20:24])[0]\r
+ self.e_entry = struct.unpack('I', data[24:28])[0]\r
+ self.e_phoff = struct.unpack('I', data[28:32])[0]\r
+ self.e_shoff = struct.unpack('I', data[32:36])[0]\r
+ self.e_flags = struct.unpack('I', data[36:40])[0]\r
+ self.e_ehsize = struct.unpack('H', data[40:42])[0]\r
+ self.e_phentsize = struct.unpack('H', data[42:44])[0]\r
+ self.e_phnum = struct.unpack('H', data[44:46])[0]\r
+ self.e_shentsize = struct.unpack('H', data[46:48])[0]\r
+ self.e_shnum = struct.unpack('H', data[48:50])[0]\r
+ self.e_shstrndx = struct.unpack('H', data[50:52])[0]\r
+\r
+ def pack(self):\r
+ # Pack the ELF header data into a binary string\r
+ data = b''\r
+ data += struct.pack('16s', self.e_ident)\r
+ data += struct.pack('H', self.e_type)\r
+ data += struct.pack('H', self.e_machine)\r
+ data += struct.pack('I', self.e_version)\r
+ data += struct.pack('I', self.e_entry)\r
+ data += struct.pack('I', self.e_phoff)\r
+ data += struct.pack('I', self.e_shoff)\r
+ data += struct.pack('I', self.e_flags)\r
+ data += struct.pack('H', self.e_ehsize)\r
+ data += struct.pack('H', self.e_phentsize)\r
+ data += struct.pack('H', self.e_phnum)\r
+ data += struct.pack('H', self.e_shentsize)\r
+ data += struct.pack('H', self.e_shnum)\r
+ data += struct.pack('H', self.e_shstrndx)\r
+ return data\r
+\r
+class Elf32_Phdr:\r
+ def __init__(self, data):\r
+ self.p_type = struct.unpack("<L", data[0:4])[0]\r
+ self.p_offset = struct.unpack("<L", data[4:8])[0]\r
+ self.p_vaddr = struct.unpack("<L", data[8:12])[0]\r
+ self.p_paddr = struct.unpack("<L", data[12:16])[0]\r
+ self.p_filesz = struct.unpack("<L", data[16:20])[0]\r
+ self.p_memsz = struct.unpack("<L", data[20:24])[0]\r
+ self.p_flags = struct.unpack("<L", data[24:28])[0]\r
+ self.p_align = struct.unpack("<L", data[28:32])[0]\r
+\r
+ def pack(self):\r
+ # Pack the Program header table into a binary string\r
+ data = b''\r
+ data += struct.pack('<L', self.p_type)\r
+ data += struct.pack('<L', self.p_offset)\r
+ data += struct.pack('<L', self.p_vaddr)\r
+ data += struct.pack('<L', self.p_paddr)\r
+ data += struct.pack('<L', self.p_filesz)\r
+ data += struct.pack('<L', self.p_memsz)\r
+ data += struct.pack('<L', self.p_flags)\r
+ data += struct.pack('<L', self.p_align)\r
+ return data\r
+\r
+def SectionAlignment(NewUPLEntry, AlignmentIndex):\r
+ # Section entry Alignment\r
+ # Alignment is transfer to integer if AlignmentIndex is string.\r
+ if isinstance(AlignmentIndex, str):\r
+ int_num = int(AlignmentIndex, 16)\r
+ int_num = 10 * (int_num//16) + int_num % 16\r
+ else:\r
+ int_num = AlignmentIndex\r
+ if (int_num != 0 or int_num != 1):\r
+ if ((len(NewUPLEntry) % int_num) != 0):\r
+ AlignNumber = int_num - (len(NewUPLEntry) % int_num)\r
+ if (AlignNumber != 0):\r
+ for x in range(AlignNumber):\r
+ NewUPLEntry = NewUPLEntry + bytearray(b'\0')\r
+ return NewUPLEntry\r
+\r
+def SectionEntryFill(SectionEntry, Alignment, Value, Offset):\r
+ # Alignment\r
+ n = 0\r
+ if (len (Value) < Alignment):\r
+ Value = Value.zfill(Alignment)\r
+ for x in range(0, (Alignment//2)):\r
+ Index = '0x' + Value[n] + Value[n + 1]\r
+ SectionEntry[Offset - x] = int(Index,16)\r
+ n += 2\r
+ return SectionEntry\r
+\r
+def ElfHeaderParser(UPLEntry):\r
+ # Read EI_CLASS, it stores information that elf with 32-bit or 64-bit architectures.\r
+ EI_CLASS = UPLEntry[4]\r
+ # If Elf is 64-bit objects.\r
+ if (EI_CLASS == 2):\r
+ # Elf header is stored at 0x0-0x40 in 64-bits objects\r
+ ElfHeaderData = UPLEntry[:64]\r
+ # If Elf is 32-bit objects.\r
+ else:\r
+ # Elf header is stored at 0x0-0x34 in 32-bits objects\r
+ ElfHeaderData = UPLEntry[:53]\r
+ # If Elf is 64-bit objects.\r
+ if (EI_CLASS == 2):\r
+ elf_header = ElfHeader64(ElfHeaderData)\r
+ ElfHeaderOffset = elf_header.e_shoff\r
+ SectionHeaderEntryNumber = elf_header.e_shnum\r
+ StringIndexNumber = elf_header.e_shstrndx\r
+ SectionHeaderEntrySize = elf_header.e_shentsize\r
+ StringIndexEntryOffset = ElfHeaderOffset + (StringIndexNumber * SectionHeaderEntrySize)\r
+ unpacked_header = ElfSectionHeader64.unpack(UPLEntry[StringIndexEntryOffset: (StringIndexEntryOffset + SectionHeaderEntrySize)])\r
+ StringIndexSize = unpacked_header.sh_size\r
+ StringIndexOffset = unpacked_header.sh_offset\r
+ # If elf is 32-bit objects.\r
+ else:\r
+ elf_header = ElfHeader32(ElfHeaderData)\r
+ ElfHeaderOffset = elf_header.e_shoff\r
+ SectionHeaderEntryNumber = elf_header.e_shnum\r
+ StringIndexNumber = elf_header.e_shstrndx\r
+ SectionHeaderEntrySize = elf_header.e_shentsize\r
+ StringIndexEntryOffset = ElfHeaderOffset + (StringIndexNumber * SectionHeaderEntrySize)\r
+ unpacked_header = ElfSectionHeader32.unpack(UPLEntry[StringIndexEntryOffset: (StringIndexEntryOffset + SectionHeaderEntrySize)])\r
+ StringIndexSize = unpacked_header.sh_size\r
+ StringIndexOffset = unpacked_header.sh_offset\r
+ return ElfHeaderOffset, SectionHeaderEntryNumber, StringIndexNumber, StringIndexEntryOffset, StringIndexSize, SectionHeaderEntrySize, StringIndexOffset, EI_CLASS\r
+\r
+def FindSection(UPLEntry, SectionName):\r
+ ElfHeaderOffset, SectionHeaderEntryNumber, StringIndexNumber, _, StringIndexSize, SectionHeaderEntrySize, StringIndexOffset, EI_CLASS = ElfHeaderParser(UPLEntry)\r
+ # StringIndex is String Index section\r
+ StringIndex = UPLEntry[StringIndexOffset:StringIndexOffset+StringIndexSize]\r
+ # Section header isn't exist if SectionNameOffset = -1.\r
+ StringIndex = StringIndex.decode('utf-8', errors='ignore')\r
+ SectionNameOffset = StringIndex.find(SectionName)\r
+ return SectionNameOffset, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, StringIndexOffset, StringIndexNumber, EI_CLASS\r
+\r
+def AddNewSectionEntry64(LastUPLEntrylen, StringIndexValue, SectionSize, Alignment):\r
+ # If elf is 64-bit objects.\r
+ NewSectionEntry = ElfSectionHeader64 (StringIndexValue, 1, 0, 0, LastUPLEntrylen, SectionSize, 0, 0, Alignment, 0)\r
+ sh_bytes = NewSectionEntry.pack()\r
+ return sh_bytes\r
+\r
+def AddNewSectionEntry32(LastUPLEntrylen, StringIndexValue, SectionSize, Alignment):\r
+ # If elf is 32-bit objects.\r
+ NewSectionEntry = ElfSectionHeader32 (StringIndexValue, 1, 0, 0, LastUPLEntrylen, SectionSize, 0, 0, Alignment, 0)\r
+ sh_bytes = NewSectionEntry.pack()\r
+ return sh_bytes\r
+\r
+def AddSectionHeader64(SHentry, NewUPLEntrylen, SectionHeaderEntrySize, Index, RemoveNameOffset, SectionName, StringIndexNumber):\r
+ SHentry = bytearray(SHentry)\r
+ unpacked_header = ElfSectionHeader64.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ # Section header of section 0 shows 0. It don't modify any offset.\r
+ if (Index != 0):\r
+ # read section offset.\r
+ unpacked_header.sh_offset = NewUPLEntrylen\r
+ # Modify offset of name in section entry\r
+ # if RemoveNameOffset != 0 that is remove function.\r
+ if (RemoveNameOffset != 0):\r
+ if (unpacked_header.sh_name > RemoveNameOffset):\r
+ unpacked_header.sh_name -= RemoveNameOffset\r
+ # Modify size of name string section entry in section entry.\r
+ if (Index == StringIndexNumber):\r
+ unpacked_header.sh_size -= len (SectionName)\r
+ # added section\r
+ else :\r
+ if (Index == StringIndexNumber):\r
+ unpacked_header.sh_size += len (SectionName)\r
+ NewSHentry = ElfSectionHeader64 (\r
+ unpacked_header.sh_name,\r
+ unpacked_header.sh_type,\r
+ unpacked_header.sh_flags,\r
+ unpacked_header.sh_addr,\r
+ unpacked_header.sh_offset,\r
+ unpacked_header.sh_size,\r
+ unpacked_header.sh_link,\r
+ unpacked_header.sh_info,\r
+ unpacked_header.sh_addralign,\r
+ unpacked_header.sh_entsize).pack()\r
+ return NewSHentry\r
+\r
+def AddSectionHeader32(SHentry, NewUPLEntrylen, SectionHeaderEntrySize, Index, RemoveNameOffset, SectionName, StringIndexNumber):\r
+ SHentry = bytearray(SHentry)\r
+ unpacked_header = ElfSectionHeader32.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ if (Index != 0):\r
+ NewSHentry = SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)]\r
+ unpacked_header.sh_offset = NewUPLEntrylen\r
+ # Modify offset of name in section entry\r
+ # if RemoveNameOffset != 0 that is remove function.\r
+ if (RemoveNameOffset != 0):\r
+ if (unpacked_header.sh_name > RemoveNameOffset):\r
+ unpacked_header.sh_name -= RemoveNameOffset\r
+ # Modify size of name string section entry in section entry.\r
+ if (Index == StringIndexNumber):\r
+ unpacked_header.sh_size -= len (SectionName)\r
+ # added section\r
+ else :\r
+ if (Index == StringIndexNumber):\r
+ unpacked_header.sh_size += len (SectionName)\r
+ NewSHentry = ElfSectionHeader32 (\r
+ unpacked_header.sh_name,\r
+ unpacked_header.sh_type,\r
+ unpacked_header.sh_flags,\r
+ unpacked_header.sh_addr,\r
+ unpacked_header.sh_offset,\r
+ unpacked_header.sh_size,\r
+ unpacked_header.sh_link,\r
+ unpacked_header.sh_info,\r
+ unpacked_header.sh_addralign,\r
+ unpacked_header.sh_entsize).pack()\r
+ return NewSHentry\r
+\r
+def ModifyPHSegmentOffset64(NewUPLEntry, ElfHeaderOffset, PHSegmentName):\r
+ # Modify offset and address of program header tables.\r
+ elf_header = ElfHeader64(NewUPLEntry[:64])\r
+ SHentry = NewUPLEntry[ElfHeaderOffset:]\r
+ # Elf program header tables start from 0x40 in 64-bits objects\r
+ PHentry = NewUPLEntry[64: 64 + (elf_header.e_phnum * elf_header.e_phentsize)]\r
+ PHdrs = []\r
+ SHdrs = []\r
+ for i in range(elf_header.e_shnum):\r
+ SHData = SHentry[(i * elf_header.e_shentsize): (i * elf_header.e_shentsize) + elf_header.e_shentsize]\r
+ unpacked_SectionHeader = ElfSectionHeader64.unpack(SHData)\r
+ SHdrs.append(unpacked_SectionHeader)\r
+ for i in range(elf_header.e_phnum):\r
+ PHData = PHentry[(i * elf_header.e_phentsize): (i * elf_header.e_phentsize) + elf_header.e_phentsize]\r
+ unpacked_ProgramHeader = Elf64_Phdr(PHData)\r
+ PHdrs.append(unpacked_ProgramHeader)\r
+ if (PHSegmentName == '.text'):\r
+ PHdrs[0].p_offset = SHdrs[1].sh_offset\r
+ PHdrs[0].p_paddr = SHdrs[1].sh_addr\r
+ PHdrs[4].p_offset = SHdrs[1].sh_offset\r
+ PHdrs[4].p_paddr = SHdrs[1].sh_addr\r
+ elif (PHSegmentName == '.dynamic'):\r
+ PHdrs[1].p_offset = SHdrs[2].sh_offset\r
+ PHdrs[1].p_paddr = SHdrs[2].sh_addr\r
+ PHdrs[3].p_offset = SHdrs[2].sh_offset\r
+ PHdrs[3].p_paddr = SHdrs[2].sh_addr\r
+ elif (PHSegmentName == '.data'):\r
+ PHdrs[2].p_offset = SHdrs[3].sh_offset\r
+ PHdrs[2].p_paddr = SHdrs[3].sh_addr\r
+ packed_PHData = b''\r
+ for phdr in PHdrs:\r
+ packed_PHData += phdr.pack()\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ NewUPLEntry[64: 64 + (elf_header.e_phnum * elf_header.e_phentsize)] = packed_PHData\r
+ return NewUPLEntry\r
+\r
+def ModifyPHSegmentOffset32(NewUPLEntry, ElfHeaderOffset, PHSegmentName):\r
+ # Modify offset and address of program header tables.\r
+ # Elf header is stored at 0x0-0x34 in 32-bits objects\r
+ elf_header = ElfHeader32(NewUPLEntry[:52])\r
+ SHentry = NewUPLEntry[ElfHeaderOffset:]\r
+ # Elf program header tables start from 0x34 in 32-bits objects\r
+ PHentry = NewUPLEntry[52: 52 + (elf_header.e_phnum * elf_header.e_phentsize)]\r
+ PHdrs = []\r
+ SHdrs = []\r
+ for i in range(elf_header.e_shnum):\r
+ SHData = SHentry[(i * elf_header.e_shentsize): (i * elf_header.e_shentsize) + elf_header.e_shentsize]\r
+ unpacked_SectionHeader = ElfSectionHeader32.unpack(SHData)\r
+ SHdrs.append(unpacked_SectionHeader)\r
+ for i in range(elf_header.e_phnum):\r
+ PHData = PHentry[(i * elf_header.e_phentsize): (i * elf_header.e_phentsize) + elf_header.e_phentsize]\r
+ unpacked_ProgramHeader = Elf32_Phdr(PHData)\r
+ PHdrs.append(unpacked_ProgramHeader)\r
+ if (PHSegmentName == '.text'):\r
+ PHdrs[0].p_offset = SHdrs[1].sh_offset\r
+ PHdrs[0].p_paddr = SHdrs[1].sh_addr\r
+ PHdrs[0].p_vaddr = SHdrs[1].sh_addr\r
+ PHdrs[2].p_offset = SHdrs[1].sh_offset\r
+ PHdrs[2].p_paddr = SHdrs[1].sh_addr\r
+ PHdrs[0].p_vaddr = SHdrs[1].sh_addr\r
+ elif (PHSegmentName == '.data'):\r
+ PHdrs[1].p_offset = SHdrs[2].sh_offset\r
+ PHdrs[1].p_paddr = SHdrs[2].sh_addr\r
+ PHdrs[1].p_vaddr = SHdrs[2].sh_addr\r
+ packed_PHData = b''\r
+ for phdr in PHdrs:\r
+ packed_PHData += phdr.pack()\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ NewUPLEntry[52: 52 + (elf_header.e_phnum * elf_header.e_phentsize)] = packed_PHData\r
+ return NewUPLEntry\r
+\r
+def RemoveSection64(UniversalPayloadEntry, RemoveSectionName):\r
+ # If elf is 64-bit objects.\r
+ # Get offsets as follows:\r
+ # 1. Section name which will remove in section name string.\r
+ # 2. Section which will remove.\r
+ # 3. Section header which will remove.\r
+ with open(UniversalPayloadEntry,'rb') as f:\r
+ UPLEntry = f.read()\r
+ RemoveSectionNameOffset, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntry, RemoveSectionName)\r
+ if (RemoveSectionNameOffset == -1):\r
+ raise argparse.ArgumentTypeError ('Section: {} not found.'.format (RemoveSectionNameOffset))\r
+ # Read section header entry\r
+ SHentry = UPLEntry[ElfHeaderOffset:]\r
+ # find deleted fv section offset.\r
+ # Elf header is stored at 0x0-0x40 in 64-bits objects\r
+ elf_header = ElfHeader64(UPLEntry[:64])\r
+ Counter = 0\r
+ RemoveIndex = 0\r
+ RemoveNameOffset = 0\r
+ for Index in range(0, elf_header.e_shnum):\r
+ # Read Index of section header.\r
+ unpacked_SectionHeader = ElfSectionHeader64.unpack(SHentry[(Index * elf_header.e_shentsize):((Index * elf_header.e_shentsize) + elf_header.e_shentsize)])\r
+ # Find offset of section name which is removed.\r
+ if (unpacked_SectionHeader.sh_name == RemoveSectionNameOffset):\r
+ RemoveIndex = Counter\r
+ Counter += 1\r
+ else:\r
+ Counter += 1\r
+ # Elf header is recombined.\r
+ # Elf header and program header table in front of first section are reserved.\r
+ # Elf header size is 0x40 with 64-bit object.\r
+ ElfHeaderSize = 64\r
+ ElfHandPH = ElfHeaderSize + (elf_header.e_phnum * elf_header.e_phentsize)\r
+ NewUPLEntry = UPLEntry[:ElfHandPH]\r
+ # Keep Section header and program header table, RemoveSection64() only recombined section and section header.\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ # Sections is recombined.\r
+ # 1. name of deleted section is removed in name string section.\r
+ # 2. deleted section is removed in dll file.\r
+ # 3. re-align sections before and after deleted section.\r
+ NewUPLEntrylen = []\r
+ for Index in range(0, (SectionHeaderEntryNumber)):\r
+ unpacked_SectionHeader = ElfSectionHeader64.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntrylen.append(len(NewUPLEntry))\r
+ if (Index == 0):\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ if (SectionHeaderEntryNumber > 2):\r
+ unpacked_NextSectionHeader = ElfSectionHeader64.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section in front of removed section\r
+ elif (Index + 1 == RemoveIndex):\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Read section address alignment\r
+ # If section that will be removed in .dll is not first and last one .\r
+ # Address alignment, section will align with alignment of section after deleted section.\r
+ # Check next and the section after next are not end of section.\r
+ if ((Index + 2) < (SectionHeaderEntryNumber - 1)):\r
+ unpacked_Next2SectionHeader = ElfSectionHeader64.unpack(SHentry[((Index + 2) * SectionHeaderEntrySize):(((Index + 2) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_Next2SectionHeader.sh_addralign)\r
+ else:\r
+ # It is align 8 bytes if next section or the section after next is last one.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ # section is Deleted section\r
+ elif (Index == RemoveIndex):\r
+ # Don't add removed section to elf.\r
+ # Find offset of section name.\r
+ RemoveNameOffset = unpacked_SectionHeader.sh_name\r
+ # section is name string section.\r
+ elif (Index == StringIndexNumber):\r
+ # StringIndex is String Index section\r
+ StringIndex = UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Remove name of removed section in name string section.\r
+ # Section header isn't exist if RemoveSectionNameOffset equal to -1.\r
+ StringIndex = bytearray(StringIndex)\r
+ RemoveSectionName = bytearray(RemoveSectionName, encoding='utf-8')\r
+ RemoveSectionName = RemoveSectionName + bytes('\0', encoding='utf-8')\r
+ StringIndex = StringIndex.replace(RemoveSectionName,b'')\r
+ NewUPLEntry += StringIndex\r
+ # other sections.\r
+ else:\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ if (Index < (SectionHeaderEntryNumber - 1)):\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ else:\r
+ # If section is last one.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ SectionHeaderOffset = len(NewUPLEntry)\r
+ # Add section header\r
+ for Number in range(0, (SectionHeaderEntryNumber)):\r
+ if (Number != RemoveIndex):\r
+ NewSHentry = AddSectionHeader64(SHentry, NewUPLEntrylen[Number], SectionHeaderEntrySize, Number, RemoveNameOffset, RemoveSectionName, StringIndexNumber)\r
+ NewUPLEntry += NewSHentry\r
+ # Modify number of sections and offset of section header in Elf header.\r
+ elf_header.e_shoff = SectionHeaderOffset\r
+ elf_header.e_shnum -= 1\r
+ NewUPLEntry = elf_header.pack() + NewUPLEntry[64:]\r
+ # write to Elf.\r
+ with open(UniversalPayloadEntry,'wb') as f:\r
+ f.write(NewUPLEntry)\r
+\r
+def RemoveSection32(UniversalPayloadEntry, RemoveSectionName):\r
+ # If elf is 32-bit objects.\r
+ # Get offsets as follows:\r
+ # 1. Section name which will remove in section name string.\r
+ # 2. Section which will remove.\r
+ # 3. Section header which will remove.\r
+ with open(UniversalPayloadEntry,'rb') as f:\r
+ UPLEntry = f.read()\r
+ RemoveSectionNameOffset, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, EI_CLASS = FindSection(UPLEntry, RemoveSectionName)\r
+ if (RemoveSectionNameOffset == -1):\r
+ raise argparse.ArgumentTypeError ('Section: {} not found.'.format (RemoveSectionNameOffset))\r
+ # Read section header entry\r
+ SHentry = UPLEntry[ElfHeaderOffset:]\r
+ # find deleted fv section offset.\r
+ # Elf header is stored at 0x0-0x34 in 32-bits objects\r
+ elf_header = ElfHeader32(UPLEntry[:52])\r
+ Counter = 0\r
+ RemoveIndex = 0\r
+ RemoveNameOffset = 0\r
+ for Index in range(0, elf_header.e_shnum):\r
+ # Read Index of section header.\r
+ unpacked_SectionHeader = ElfSectionHeader32.unpack(SHentry[(Index * elf_header.e_shentsize):((Index * elf_header.e_shentsize) + elf_header.e_shentsize)])\r
+ # Find offset of section name which is removed.\r
+ if (unpacked_SectionHeader.sh_name == RemoveSectionNameOffset):\r
+ RemoveIndex = Counter\r
+ Counter += 1\r
+ else:\r
+ Counter += 1\r
+ # Elf header is recombined.\r
+ # Elf header and program header table in front of first section are reserved.\r
+ # Elf header size is 0x34 with 32-bit object.\r
+ ElfHeaderSize = 52\r
+ ElfHandPH = ElfHeaderSize + (elf_header.e_phnum * elf_header.e_phentsize)\r
+ NewUPLEntry = UPLEntry[:ElfHandPH]\r
+ # Keep Section header and program header table, RemoveSection32() only recombined section and section header.\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ # Sections is recombined.\r
+ # 1. name of deleted section is removed in name string section.\r
+ # 2. deleted section is removed in dll file.\r
+ # 3. re-align sections before and after deleted section.\r
+ NewUPLEntrylen = []\r
+ for Index in range(0, (SectionHeaderEntryNumber)):\r
+ unpacked_SectionHeader = ElfSectionHeader32.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntrylen.append(len(NewUPLEntry))\r
+ if (Index == 0):\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ if (SectionHeaderEntryNumber > 2):\r
+ unpacked_NextSectionHeader = ElfSectionHeader32.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section in front of removed section\r
+ elif (Index + 1 == RemoveIndex):\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Read section address alignment\r
+ # If section that will be removed in .dll is not first and last one .\r
+ # Address alignment, section will align with alignment of section after deleted section.\r
+ # Check next and the section after next are not end of section.\r
+ if ((Index + 2) < (SectionHeaderEntryNumber - 1)):\r
+ unpacked_Next2SectionHeader = ElfSectionHeader32.unpack(SHentry[((Index + 2) * SectionHeaderEntrySize):(((Index + 2) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_Next2SectionHeader.sh_addralign)\r
+ else:\r
+ # It is align 8 bytes if next section or the section after next is last one.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ # section is Deleted section\r
+ elif (Index == RemoveIndex):\r
+ # Don't add removed section to elf.\r
+ # Find offset of section name.\r
+ RemoveNameOffset = unpacked_SectionHeader.sh_name\r
+ # section is name string section.\r
+ elif (Index == StringIndexNumber):\r
+ # StringIndex is String Index section\r
+ StringIndex = UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Remove name of removed section in name string section.\r
+ # Section header isn't exist if RemoveSectionNameOffset equal to -1.\r
+ StringIndex = bytearray(StringIndex)\r
+ RemoveSectionName = bytearray(RemoveSectionName, encoding='utf-8')\r
+ RemoveSectionName = RemoveSectionName + bytes('\0', encoding='utf-8')\r
+ StringIndex = StringIndex.replace(RemoveSectionName,b'')\r
+ NewUPLEntry += StringIndex\r
+ # other sections.\r
+ else:\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ if (Index < (SectionHeaderEntryNumber - 1)):\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ else:\r
+ # If section is last one.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ SectionHeaderOffset = len(NewUPLEntry)\r
+ # Add section header\r
+ for Number in range(0, (SectionHeaderEntryNumber)):\r
+ if (Number != RemoveIndex):\r
+ NewSHentry = AddSectionHeader32(SHentry, NewUPLEntrylen[Number], SectionHeaderEntrySize, Number, RemoveNameOffset, RemoveSectionName, StringIndexNumber)\r
+ NewUPLEntry += NewSHentry\r
+ # Modify number of sections and offset of section header in Elf header.\r
+ elf_header.e_shoff = SectionHeaderOffset\r
+ elf_header.e_shnum -= 1\r
+ NewUPLEntry = elf_header.pack() + NewUPLEntry[52:]\r
+ # write to Elf.\r
+ with open(UniversalPayloadEntry,'wb') as f:\r
+ f.write(NewUPLEntry)\r
+\r
+def AddSection64(UniversalPayloadEntry, AddSectionName, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, StringIndexNumber, FileBinary, Alignment):\r
+ with open(UniversalPayloadEntry,'rb+') as f:\r
+ UPLEntry = f.read()\r
+ fFileBinary = open(FileBinary, 'rb')\r
+ Binary_File = fFileBinary.read()\r
+ ElfHeaderOffset, SectionHeaderEntryNumber, StringIndexNumber, _, _, SectionHeaderEntrySize, _, _ = ElfHeaderParser(UPLEntry)\r
+ # Read section header entry\r
+ SHentry = UPLEntry[ElfHeaderOffset:]\r
+ # Elf header is recombined.\r
+ # Elf header and program header table in front of first section are reserved.\r
+ # Elf header is stored at 0x0-0x40 in 64-bits objects\r
+ elf_header = ElfHeader64(UPLEntry[:64])\r
+ # Elf header size is 0x40 with 64-bit object.\r
+ ElfHeaderSize = 64\r
+ ElfHandPH = ElfHeaderSize + (elf_header.e_phnum * elf_header.e_phentsize)\r
+ NewUPLEntry = UPLEntry[:ElfHandPH]\r
+ # Keep Section header and program header table, AddSection64() only recombined section and section header.\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ # Sections is recombined.\r
+ # 1. name of added section is added in name string section.\r
+ # 2. added section is added in dll file.\r
+ # 3. re-align sections before and after added section.\r
+ NewUPLEntrylen = []\r
+ StringIndexValue = 0\r
+ for Index in range(0, SectionHeaderEntryNumber):\r
+ NewUPLEntrylen.append(len(NewUPLEntry))\r
+ unpacked_SectionHeader = ElfSectionHeader64.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ # Sections is recombined.\r
+ if (Index == 0):\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ if (SectionHeaderEntryNumber > 2):\r
+ unpacked_NextSectionHeader = ElfSectionHeader64.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section is last one.\r
+ elif (Index == (SectionHeaderEntryNumber - 1)):\r
+ # Add new section at the end.\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, Alignment)\r
+ LastUPLEntrylen = len(NewUPLEntry)\r
+ NewUPLEntry += Binary_File\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ # section is name string section.\r
+ elif (Index == StringIndexNumber):\r
+ # StringIndex is String Index section\r
+ StringIndex = UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Read name of added Section after StringIndex is transform into string.\r
+ StringIndex = bytearray(StringIndex)\r
+ StringIndexValue = len(StringIndex)\r
+ AddSectionName = bytearray(AddSectionName, encoding='utf-8') + bytes('\0', encoding='utf-8')\r
+ StringIndex += AddSectionName\r
+ NewUPLEntry += StringIndex\r
+ # section after name string section but not last one.\r
+ elif ((Index > StringIndexNumber) and (Index < (SectionHeaderEntryNumber - 1))):\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ unpacked_NextSectionHeader = ElfSectionHeader64.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section before name string section.\r
+ else:\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ if (Index < (SectionHeaderEntryNumber - 1)):\r
+ unpacked_NextSectionHeader = ElfSectionHeader64.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ SectionHeaderOffset = len(NewUPLEntry)\r
+ RemoveNameOffset = 0\r
+ # Add section header\r
+ for Number in range(0, (SectionHeaderEntryNumber)):\r
+ NewSHentry = AddSectionHeader64(SHentry, NewUPLEntrylen[Number], SectionHeaderEntrySize, Number, RemoveNameOffset, AddSectionName, StringIndexNumber)\r
+ NewUPLEntry += NewSHentry\r
+ NewUPLEntry += bytearray(AddNewSectionEntry64(LastUPLEntrylen, StringIndexValue, len(Binary_File), Alignment))\r
+ # Modify number of sections and offset of section header in Elf header.\r
+ # Modify offset in in Elf header.\r
+ elf_header.e_shoff = SectionHeaderOffset\r
+ elf_header.e_shnum += 1\r
+ elf_header = elf_header.pack()\r
+ UPLEntryBin = elf_header + NewUPLEntry[64:]\r
+ # Modify offsets and address of program header table in elf.\r
+ PHSegmentName = '.text'\r
+ _, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntryBin, PHSegmentName)\r
+ UPLEntryBin = ModifyPHSegmentOffset64(UPLEntryBin, ElfHeaderOffset, PHSegmentName)\r
+ # Modify offsets and address of program header table in elf.\r
+ PHSegmentName = '.dynamic'\r
+ _, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntryBin, PHSegmentName)\r
+ UPLEntryBin = ModifyPHSegmentOffset64(UPLEntryBin, ElfHeaderOffset, PHSegmentName)\r
+ # Modify offsets and address of program header table in elf.\r
+ PHSegmentName = '.data'\r
+ _, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntryBin, PHSegmentName)\r
+ UPLEntryBin = ModifyPHSegmentOffset64(UPLEntryBin, ElfHeaderOffset, PHSegmentName)\r
+ fFileBinary.close()\r
+ return UPLEntryBin\r
+\r
+def AddSection32(UniversalPayloadEntry, AddSectionName, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, StringIndexNumber, FileBinary, Alignment):\r
+ with open(UniversalPayloadEntry,'rb+') as f:\r
+ # Read Elf and binary which will be write to elf.\r
+ UPLEntry = f.read()\r
+ fFileBinary = open(FileBinary, 'rb')\r
+ Binary_File = fFileBinary.read()\r
+ ElfHeaderOffset, SectionHeaderEntryNumber, StringIndexNumber, _, _, SectionHeaderEntrySize, _, _ = ElfHeaderParser(UPLEntry)\r
+ # Read section header entry\r
+ SHentry = UPLEntry[ElfHeaderOffset:]\r
+ # Elf header is recombined.\r
+ # Elf header and program header table in front of first section are reserved.\r
+ # Elf header is stored at 0x0-0x34 in 32-bits objects\r
+ elf_header = ElfHeader32(UPLEntry[:52])\r
+ # Elf header size is 0x34 with 32-bit object.\r
+ ElfHeaderSize = 52\r
+ ElfHandPH = ElfHeaderSize + (elf_header.e_phnum * elf_header.e_phentsize)\r
+ NewUPLEntry = UPLEntry[:ElfHandPH]\r
+ # Keep Section header and program header table, AddSection64() only recombined section and section header.\r
+ NewUPLEntry = bytearray(NewUPLEntry)\r
+ # Sections is recombined.\r
+ # 1. name of added section is added in name string section.\r
+ # 2. added section is added in dll file.\r
+ # 3. re-align sections before and after added section.\r
+ NewUPLEntrylen = []\r
+ StringIndexValue = 0\r
+ for Index in range(0, SectionHeaderEntryNumber):\r
+ NewUPLEntrylen.append(len(NewUPLEntry))\r
+ unpacked_SectionHeader = ElfSectionHeader32.unpack(SHentry[(Index * SectionHeaderEntrySize):((Index * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ # Sections is recombined.\r
+ if (Index == 0):\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ if (SectionHeaderEntryNumber > 2):\r
+ unpacked_NextSectionHeader = ElfSectionHeader32.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section is last one.\r
+ elif (Index == (SectionHeaderEntryNumber - 1)):\r
+ # Add new section at the end.\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, Alignment)\r
+ LastUPLEntrylen = len(NewUPLEntry)\r
+ NewUPLEntry += Binary_File\r
+ # Address alignment, section will align with alignment of next section.\r
+ AlignmentIndex = 8\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, AlignmentIndex)\r
+ # section is name string section.\r
+ elif (Index == StringIndexNumber):\r
+ # StringIndex is String Index section\r
+ StringIndex = UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Read name of added Section after StringIndex is transform into string.\r
+ StringIndex = bytearray(StringIndex)\r
+ StringIndexValue = len(StringIndex)\r
+ AddSectionName = bytearray(AddSectionName, encoding='utf-8') + bytes('\0', encoding='utf-8')\r
+ StringIndex += AddSectionName\r
+ NewUPLEntry += StringIndex\r
+ # section after name string section but not last one.\r
+ elif ((Index > StringIndexNumber) and (Index < (SectionHeaderEntryNumber - 1))):\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ unpacked_NextSectionHeader = ElfSectionHeader32.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ # Section before name string section.\r
+ else:\r
+ NewUPLEntry += UPLEntry[unpacked_SectionHeader.sh_offset:(unpacked_SectionHeader.sh_offset + unpacked_SectionHeader.sh_size)]\r
+ # Address alignment, section will align with alignment of next section.\r
+ if (Index < (SectionHeaderEntryNumber - 1)):\r
+ unpacked_NextSectionHeader = ElfSectionHeader32.unpack(SHentry[((Index + 1) * SectionHeaderEntrySize):(((Index + 1) * SectionHeaderEntrySize) + SectionHeaderEntrySize)])\r
+ NewUPLEntry = SectionAlignment(NewUPLEntry, unpacked_NextSectionHeader.sh_addralign)\r
+ SectionHeaderOffset = len(NewUPLEntry)\r
+ RemoveNameOffset = 0\r
+ # Add section header\r
+ for Number in range(0, (SectionHeaderEntryNumber)):\r
+ NewSHentry = AddSectionHeader32(SHentry, NewUPLEntrylen[Number], SectionHeaderEntrySize, Number, RemoveNameOffset, AddSectionName, StringIndexNumber)\r
+ NewUPLEntry += NewSHentry\r
+ NewUPLEntry += bytearray(AddNewSectionEntry32(LastUPLEntrylen, StringIndexValue, len(Binary_File), Alignment))\r
+ # Modify number of sections and offset of section header in Elf header.\r
+ # Modify offset in in Elf header.\r
+ elf_header.e_shoff = SectionHeaderOffset\r
+ elf_header.e_shnum += 1\r
+ PHTableSize = elf_header.e_phentsize\r
+ elf_header = elf_header.pack()\r
+ UPLEntryBin = elf_header + NewUPLEntry[52:]\r
+ # Modify offsets and address of program header table in elf.\r
+ PHSegmentName = '.text'\r
+ _, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntryBin, PHSegmentName)\r
+ UPLEntryBin = ModifyPHSegmentOffset32(UPLEntryBin, ElfHeaderOffset, PHSegmentName)\r
+ # Modify offsets and address of program header table in elf. Its are stored at 0x08-0x0F and 0x10-0x17\r
+ PHSegmentName = '.data'\r
+ _, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, _ = FindSection(UPLEntryBin, PHSegmentName)\r
+ UPLEntryBin = ModifyPHSegmentOffset32(UPLEntryBin, ElfHeaderOffset, PHSegmentName)\r
+ fFileBinary.close()\r
+ return UPLEntryBin\r
+\r
+def ReplaceFv (UniversalPayloadEntry, FileBinary, AddSectionName, Alignment = 16):\r
+ with open(UniversalPayloadEntry,'rb+') as f:\r
+ UPLEntry = f.read()\r
+ SectionNameOffset, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, _, StringIndexNumber, EI_CLASS = FindSection(UPLEntry, AddSectionName)\r
+ # If elf is 64-bit objects.\r
+ if (EI_CLASS == 2):\r
+ # Remove section if it exists.\r
+ if (SectionNameOffset != -1):\r
+ RemoveSection64(UniversalPayloadEntry, AddSectionName)\r
+ # Add section.\r
+ NewUPLEntry = AddSection64(UniversalPayloadEntry, AddSectionName, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, StringIndexNumber, FileBinary, Alignment)\r
+ # If elf is 32-bit objects.\r
+ else:\r
+ # Remove section if it exists.\r
+ if (SectionNameOffset != -1):\r
+ RemoveSection32(UniversalPayloadEntry, AddSectionName)\r
+ # Add section.\r
+ NewUPLEntry = AddSection32(UniversalPayloadEntry, AddSectionName, ElfHeaderOffset, SectionHeaderEntrySize, SectionHeaderEntryNumber, StringIndexNumber, FileBinary, Alignment)\r
+ with open(UniversalPayloadEntry,'wb') as f:\r
+ f.write(NewUPLEntry)\r
+ return 0\r
import shutil\r
import sys\r
from ctypes import *\r
-\r
+from Tools.ElfFv import ReplaceFv\r
sys.dont_write_bytecode = True\r
\r
class UPLD_INFO_HEADER(LittleEndianStructure):\r
self.ImageId = b'UEFI'\r
self.ProducerId = b'INTEL'\r
\r
-def GenSpecRevision (Argument):\r
- try:\r
- (MajorStr, MinorStr) = Argument.split('.')\r
- except:\r
- raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
- #\r
- # Spec Revision Bits 15 : 8 - Major Version. Bits 7 : 0 - Minor Version.\r
- #\r
- if len(MinorStr) > 0 and len(MinorStr) < 3:\r
- try:\r
- Minor = int(MinorStr, 16) if len(MinorStr) == 2 else (int(MinorStr, 16) << 4)\r
- except:\r
- raise argparse.ArgumentTypeError ('{} Minor version of SpecRevision is not a valid integer value.'.format (Argument))\r
- else:\r
- raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
+def BuildUniversalPayload(Args):\r
+ def RunCommand(cmd):\r
+ print(cmd)\r
+ p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,cwd=os.environ['WORKSPACE'])\r
+ while True:\r
+ line = p.stdout.readline()\r
+ if not line:\r
+ break\r
+ print(line.strip().decode(errors='ignore'))\r
+\r
+ p.communicate()\r
+ if p.returncode != 0:\r
+ print("- Failed - error happened when run command: %s"%cmd)\r
+ raise Exception("ERROR: when run command: %s"%cmd)\r
\r
- if len(MajorStr) > 0 and len(MajorStr) < 3:\r
- try:\r
- Major = int(MajorStr, 16)\r
- except:\r
- raise argparse.ArgumentTypeError ('{} Major version of SpecRevision is not a valid integer value.'.format (Argument))\r
- else:\r
- raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
-\r
- return int('0x{0:02x}{1:02x}'.format(Major, Minor), 0)\r
-\r
-def Validate32BitInteger (Argument):\r
- try:\r
- Value = int (Argument, 0)\r
- except:\r
- raise argparse.ArgumentTypeError ('{} is not a valid integer value.'.format (Argument))\r
- if Value < 0:\r
- raise argparse.ArgumentTypeError ('{} is a negative value.'.format (Argument))\r
- if Value > 0xffffffff:\r
- raise argparse.ArgumentTypeError ('{} is larger than 32-bits.'.format (Argument))\r
- return Value\r
-\r
-def RunCommand(cmd):\r
- print(cmd)\r
- p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,cwd=os.environ['WORKSPACE'])\r
- while True:\r
- line = p.stdout.readline()\r
- if not line:\r
- break\r
- print(line.strip().decode(errors='ignore'))\r
-\r
- p.communicate()\r
- if p.returncode != 0:\r
- print("- Failed - error happened when run command: %s"%cmd)\r
- raise Exception("ERROR: when run command: %s"%cmd)\r
-\r
-def BuildUniversalPayload(Args, MacroList):\r
BuildTarget = Args.Target\r
ToolChain = Args.ToolChain\r
Quiet = "--quiet" if Args.Quiet else ""\r
ElfToolChain = 'CLANGDWARF'\r
BuildDir = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64"))\r
+ BuildModule = ""\r
+ BuildArch = ""\r
if Args.Arch == 'X64':\r
BuildArch = "X64"\r
- ObjCopyFlag = "elf64-x86-64"\r
EntryOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))\r
else:\r
BuildArch = "IA32 -a X64"\r
- ObjCopyFlag = "elf32-i386"\r
EntryOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))\r
\r
if Args.PreBuildUplBinary is not None:\r
EntryOutputDir = os.path.abspath(Args.PreBuildUplBinary)\r
- EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf")\r
DscPath = os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc")\r
- DxeFvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/DXEFV.Fv"))\r
- BdsFvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/BDSFV.Fv"))\r
- NetworkFvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/NETWORKFV.Fv"))\r
- PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt")\r
ModuleReportPath = os.path.join(BuildDir, "UefiUniversalPayloadEntry.txt")\r
UpldInfoFile = os.path.join(BuildDir, "UniversalPayloadInfo.bin")\r
\r
- if "CLANG_BIN" in os.environ:\r
- LlvmObjcopyPath = os.path.join(os.environ["CLANG_BIN"], "llvm-objcopy")\r
- else:\r
- LlvmObjcopyPath = "llvm-objcopy"\r
- try:\r
- RunCommand('"%s" --version'%LlvmObjcopyPath)\r
- except:\r
- print("- Failed - Please check if LLVM is installed or if CLANG_BIN is set correctly")\r
- sys.exit(1)\r
-\r
Pcds = ""\r
if (Args.pcd != None):\r
for PcdItem in Args.pcd:\r
Pcds += " --pcd {}".format (PcdItem)\r
\r
Defines = ""\r
- for key in MacroList:\r
- Defines +=" -D {0}={1}".format(key, MacroList[key])\r
+ if (Args.Macro != None):\r
+ for MacroItem in Args.Macro:\r
+ Defines += " -D {}".format (MacroItem)\r
\r
#\r
# Building DXE core and DXE drivers as DXEFV.\r
#\r
if Args.BuildEntryOnly == False:\r
+ PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt")\r
BuildPayload = "build -p {} -b {} -a X64 -t {} -y {} {}".format (DscPath, BuildTarget, ToolChain, PayloadReportPath, Quiet)\r
BuildPayload += Pcds\r
BuildPayload += Defines\r
# Building Universal Payload entry.\r
#\r
if Args.PreBuildUplBinary is None:\r
+ EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf")\r
BuildModule = "build -p {} -b {} -a {} -m {} -t {} -y {} {}".format (DscPath, BuildTarget, BuildArch, EntryModuleInf, ElfToolChain, ModuleReportPath, Quiet)\r
BuildModule += Pcds\r
BuildModule += Defines\r
#\r
# Buid Universal Payload Information Section ".upld_info"\r
#\r
- upld_info_hdr = UPLD_INFO_HEADER()\r
+ upld_info_hdr = UPLD_INFO_HEADER()\r
upld_info_hdr.SpecRevision = Args.SpecRevision\r
- upld_info_hdr.Revision = Args.Revision\r
- upld_info_hdr.ProducerId = Args.ProducerId.encode()[:16]\r
- upld_info_hdr.ImageId = Args.ImageId.encode()[:16]\r
- upld_info_hdr.Attribute |= 1 if BuildTarget == "DEBUG" else 0\r
+ upld_info_hdr.Revision = Args.Revision\r
+ upld_info_hdr.ProducerId = Args.ProducerId.encode()[:16]\r
+ upld_info_hdr.ImageId = Args.ImageId.encode()[:16]\r
+ upld_info_hdr.Attribute |= 1 if BuildTarget == "DEBUG" else 0\r
fp = open(UpldInfoFile, 'wb')\r
fp.write(bytearray(upld_info_hdr))\r
fp.close()\r
\r
+ MultiFvList = []\r
if Args.BuildEntryOnly == False:\r
- #\r
- # Copy the DXEFV as a section in elf format Universal Payload entry.\r
- #\r
- remove_section = '"{}" -I {} -O {} --remove-section .upld_info --remove-section .upld.uefi_fv --remove-section .upld.bds_fv {}'.format (\r
- LlvmObjcopyPath,\r
- ObjCopyFlag,\r
- ObjCopyFlag,\r
- EntryOutputDir\r
- )\r
- add_section = '"{}" -I {} -O {} --add-section .upld_info={} --add-section .upld.uefi_fv={} --add-section .upld.bds_fv={} {}'.format (\r
- LlvmObjcopyPath,\r
- ObjCopyFlag,\r
- ObjCopyFlag,\r
- UpldInfoFile,\r
- DxeFvOutputDir,\r
- BdsFvOutputDir,\r
- EntryOutputDir\r
- )\r
- set_section = '"{}" -I {} -O {} --set-section-alignment .upld_info=4 --set-section-alignment .upld.uefi_fv=16 --set-section-alignment .upld.bds_fv=16 {}'.format (\r
- LlvmObjcopyPath,\r
- ObjCopyFlag,\r
- ObjCopyFlag,\r
- EntryOutputDir\r
- )\r
- #\r
- # Append network fv to sections if exists\r
- #\r
- if os.path.isfile(NetworkFvOutputDir):\r
- index = remove_section.find(EntryOutputDir)\r
- remove_section = remove_section[:index] + '--remove-section .upld.network_fv ' + remove_section[index:]\r
- index = add_section.find(EntryOutputDir)\r
- add_section = add_section[:index] + '--add-section .upld.network_fv=' + NetworkFvOutputDir + ' ' + add_section[index:]\r
- index = set_section.find(EntryOutputDir)\r
- set_section = set_section[:index] + '--set-section-alignment .upld.network_fv=16 ' + set_section[index:]\r
-\r
- RunCommand(remove_section)\r
- RunCommand(add_section)\r
- RunCommand(set_section)\r
+ MultiFvList = [\r
+ ['uefi_fv', os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/DXEFV.Fv")) ],\r
+ ['bds_fv', os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/BDSFV.Fv")) ],\r
+ ['network_fv', os.path.join(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/NETWORKFV.Fv")) ],\r
+ ]\r
+ AddSectionName = '.upld_info'\r
+ ReplaceFv (EntryOutputDir, UpldInfoFile, AddSectionName, Alignment = 4)\r
\r
shutil.copy (EntryOutputDir, os.path.join(BuildDir, 'UniversalPayload.elf'))\r
\r
+ return MultiFvList, os.path.join(BuildDir, 'UniversalPayload.elf')\r
+\r
def main():\r
+ def ValidateSpecRevision (Argument):\r
+ try:\r
+ (MajorStr, MinorStr) = Argument.split('.')\r
+ except:\r
+ raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
+ #\r
+ # Spec Revision Bits 15 : 8 - Major Version. Bits 7 : 0 - Minor Version.\r
+ #\r
+ if len(MinorStr) > 0 and len(MinorStr) < 3:\r
+ try:\r
+ Minor = int(MinorStr, 16) if len(MinorStr) == 2 else (int(MinorStr, 16) << 4)\r
+ except:\r
+ raise argparse.ArgumentTypeError ('{} Minor version of SpecRevision is not a valid integer value.'.format (Argument))\r
+ else:\r
+ raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
+\r
+ if len(MajorStr) > 0 and len(MajorStr) < 3:\r
+ try:\r
+ Major = int(MajorStr, 16)\r
+ except:\r
+ raise argparse.ArgumentTypeError ('{} Major version of SpecRevision is not a valid integer value.'.format (Argument))\r
+ else:\r
+ raise argparse.ArgumentTypeError ('{} is not a valid SpecRevision format (Major[8-bits].Minor[8-bits]).'.format (Argument))\r
+\r
+ return int('0x{0:02x}{1:02x}'.format(Major, Minor), 0)\r
+\r
+ def Validate32BitInteger (Argument):\r
+ try:\r
+ Value = int (Argument, 0)\r
+ except:\r
+ raise argparse.ArgumentTypeError ('{} is not a valid integer value.'.format (Argument))\r
+ if Value < 0:\r
+ raise argparse.ArgumentTypeError ('{} is a negative value.'.format (Argument))\r
+ if Value > 0xffffffff:\r
+ raise argparse.ArgumentTypeError ('{} is larger than 32-bits.'.format (Argument))\r
+ return Value\r
+\r
+ def ValidateAddFv (Argument):\r
+ Value = Argument.split ("=")\r
+ if len (Value) != 2:\r
+ raise argparse.ArgumentTypeError ('{} is incorrect format with "xxx_fv=xxx.fv"'.format (Argument))\r
+ if Value[0][-3:] != "_fv":\r
+ raise argparse.ArgumentTypeError ('{} is incorrect format with "xxx_fv=xxx.fv"'.format (Argument))\r
+ if Value[1][-3:].lower () != ".fv":\r
+ raise argparse.ArgumentTypeError ('{} is incorrect format with "xxx_fv=xxx.fv"'.format (Argument))\r
+ if os.path.exists (Value[1]) == False:\r
+ raise argparse.ArgumentTypeError ('File {} is not found.'.format (Value[1]))\r
+ return Value\r
+\r
parser = argparse.ArgumentParser(description='For building Universal Payload')\r
parser.add_argument('-t', '--ToolChain')\r
parser.add_argument('-b', '--Target', default='DEBUG')\r
parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI')\r
parser.add_argument('-q', '--Quiet', action='store_true', help='Disable all build messages except FATAL ERRORS.')\r
parser.add_argument("-p", "--pcd", action="append")\r
- parser.add_argument("-s", "--SpecRevision", type=GenSpecRevision, default ='0.7', help='Indicates compliance with a revision of this specification in the BCD format.')\r
+ parser.add_argument("-s", "--SpecRevision", type=ValidateSpecRevision, default ='0.7', help='Indicates compliance with a revision of this specification in the BCD format.')\r
parser.add_argument("-r", "--Revision", type=Validate32BitInteger, default ='0x0000010105', help='Revision of the Payload binary. Major.Minor.Revision.Build')\r
parser.add_argument("-o", "--ProducerId", default ='INTEL', help='A null-terminated OEM-supplied string that identifies the payload producer (16 bytes maximal).')\r
parser.add_argument("-e", "--BuildEntryOnly", action='store_true', help='Build UniversalPayload Entry file')\r
parser.add_argument("-pb", "--PreBuildUplBinary", default=None, help='Specify the UniversalPayload file')\r
- MacroList = {}\r
+ parser.add_argument("-sk", "--SkipBuild", action='store_true', help='Skip UniversalPayload build')\r
+ parser.add_argument("-af", "--AddFv", type=ValidateAddFv, action='append', help='Add or replace specific FV into payload, Ex: uefi_fv=XXX.fv')\r
args = parser.parse_args()\r
- if args.Macro is not None:\r
- for Argument in args.Macro:\r
- if Argument.count('=') != 1:\r
- print("Unknown variable passed in: %s"%Argument)\r
- raise Exception("ERROR: Unknown variable passed in: %s"%Argument)\r
- tokens = Argument.strip().split('=')\r
- MacroList[tokens[0].upper()] = tokens[1]\r
- BuildUniversalPayload(args, MacroList)\r
- print ("Successfully build Universal Payload")\r
+\r
+ MultiFvList = []\r
+ UniversalPayloadBinary = args.PreBuildUplBinary\r
+ if (args.SkipBuild == False):\r
+ MultiFvList, UniversalPayloadBinary = BuildUniversalPayload(args)\r
+\r
+ if (args.AddFv != None):\r
+ for (SectionName, SectionFvFile) in args.AddFv:\r
+ MultiFvList.append ([SectionName, SectionFvFile])\r
+\r
+ if (UniversalPayloadBinary != None):\r
+ for (SectionName, SectionFvFile) in MultiFvList:\r
+ if os.path.exists (SectionFvFile) == False:\r
+ continue\r
+ print ("Patch {}={} into {}".format (SectionName, SectionFvFile, UniversalPayloadBinary))\r
+ ReplaceFv (UniversalPayloadBinary, SectionFvFile, '.upld.{}'.format (SectionName))\r
+\r
+ print ("\nSuccessfully build Universal Payload")\r
\r
if __name__ == '__main__':\r
main()\r
projects / ovmf.git / commitdiff