Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work around renamed ENUM_P_TYPE variables in elftools 0.25 and up. #1191

Closed
wants to merge 2 commits into from
Closed

Work around renamed ENUM_P_TYPE variables in elftools 0.25 and up. #1191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82cdff
Work around renamed ENUM_P_TYPE variables in elftools 0.25 and up.
rickyz Sep 2, 2018
dc49ad9
Update elf.py
zachriggle Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pwnlib/elf/elf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,17 @@
from elftools.elf.constants import SHN_INDICES
from elftools.elf.descriptions import describe_e_type
from elftools.elf.elffile import ELFFile
from elftools.elf.enums import ENUM_P_TYPE
from elftools.elf.gnuversions import GNUVerDefSection
from elftools.elf.relocation import RelocationSection
from elftools.elf.sections import SymbolTableSection
from elftools.elf.segments import InterpSegment

# See https://github.com/Gallopsled/pwntools/issues/1189
try:
from elftools.elf.enums import ENUM_P_TYPE
except ImportError:
from elftools.elf.enums import ENUM_P_TYPE_BASE as ENUM_P_TYPE

import intervaltree

from pwnlib import adb
Expand Down Expand Up @@ -1767,4 +1772,3 @@ def disable_nx(self):
return

log.error("Could not find PT_GNU_STACK, stack should already be executable")