Index: htelfphs.cc --- htelfphs.cc.orig +++ htelfphs.cc @@ -28,21 +28,21 @@ static ht_mask_ptable elfprogramheader32[]= { - {"type", STATICTAG_EDIT_DWORD_VE("00000000")" ("STATICTAG_DESC_DWORD_VE("00000000", ATOM_ELF_PH_TYPE_STR)")"}, + {"type", STATICTAG_EDIT_DWORD_VE("00000000") " (" STATICTAG_DESC_DWORD_VE("00000000", ATOM_ELF_PH_TYPE_STR)")"}, {"offset", STATICTAG_EDIT_DWORD_VE("00000004")}, {"virtual address", STATICTAG_EDIT_DWORD_VE("00000008")}, {"physical address", STATICTAG_EDIT_DWORD_VE("0000000c")}, {"in file size", STATICTAG_EDIT_DWORD_VE("00000010")}, {"in memory size", STATICTAG_EDIT_DWORD_VE("00000014")}, - {"flags", STATICTAG_EDIT_DWORD_VE("00000018")" "STATICTAG_FLAGS("00000018", ATOM_ELF_PH_FLAGS_STR)}, + {"flags", STATICTAG_EDIT_DWORD_VE("00000018") " " STATICTAG_FLAGS("00000018", ATOM_ELF_PH_FLAGS_STR)}, {"alignment", STATICTAG_EDIT_DWORD_VE("0000001c")}, {0, 0} }; static ht_mask_ptable elfprogramheader64[]= { - {"type", STATICTAG_EDIT_DWORD_VE("00000000")" ("STATICTAG_DESC_DWORD_VE("00000000", ATOM_ELF_PH_TYPE_STR)")"}, - {"flags", STATICTAG_EDIT_DWORD_VE("00000004")" "STATICTAG_FLAGS("00000004", ATOM_ELF_PH_FLAGS_STR)}, + {"type", STATICTAG_EDIT_DWORD_VE("00000000") " (" STATICTAG_DESC_DWORD_VE("00000000", ATOM_ELF_PH_TYPE_STR)")"}, + {"flags", STATICTAG_EDIT_DWORD_VE("00000004") " " STATICTAG_FLAGS("00000004", ATOM_ELF_PH_FLAGS_STR)}, {"offset", STATICTAG_EDIT_QWORD_VE("00000008")}, {"virtual address", STATICTAG_EDIT_QWORD_VE("00000010")}, {"physical address", STATICTAG_EDIT_QWORD_VE("00000018")}, @@ -67,6 +67,11 @@ static int_hash elf_ph_type[] = {ELF_PT_GNU_STACK, "gnu stack"}, {ELF_PT_GNU_RELRO, "gnu relro"}, {ELF_PT_PAX_FLAGS, "pax flags"}, + {ELF_PT_OPENBSD_MUTABLE, "openbsd mutable"}, + {ELF_PT_OPENBSD_RANDOMIZE, "openbsd randomize"}, + {ELF_PT_OPENBSD_WXNEEDED, "openbsd wxneeded"}, + {ELF_PT_OPENBSD_NOBTCFI, "openbsd nobtcfi"}, + {ELF_PT_OPENBSD_BOOTDATA, "openbsd bootdata"}, {0, 0} };