Work around renamed ENUM_P_TYPE variables in elftools 0.25 and up.

[rickyz]

Elftools 0.25 renamed ENUM_P_TYPE to ENUM_P_TYPE_BASE: eliben/pyelftools@7371660

Work around this by attempting to import both names.

Fixes #1189.

[rickyz]

Added a comment, thanks!

[rickyz]

@zachriggle (who commented on PR #1190)

[disconnect3d]

Works for me 👍

[billm]

While this allows pwntools to run for me, I couldn't successfully execute the demo code in http://docs.pwntools.com/en/stable/elf/corefile.html?highlight=core#using-corefiles-to-automate-exploitation.

With this patch:

[+] Starting local process './crash': pid 32634
[] Process './crash' stopped with exit code -11 (SIGSEGV) (pid 32634)
[+] Parsing corefile...: Done
[!] Could not find the stack!
[] '/home/billm/pwntest/core'
Arch: i386-32-little
EIP: 0x0
ESP: 0x0
Traceback (most recent call last):
File "demo.py", line 13, in
assert pack(core.eip) in payload
File "/usr/local/lib/python2.7/dist-packages/pwnlib/elf/corefile.py", line 1090, in getattr
return super(Corefile, self).getattribute(attribute)
AttributeError: 'Coredump' object has no attribute 'eip'

And with pyelftools pinned to 0.24

[+] Starting local process './crash': pid 32721
[] Process './crash' stopped with exit code -11 (SIGSEGV) (pid 32721)
[+] Parsing corefile...: Done
[] '/home/billm/pwntest/core'
Arch: i386-32-little
EIP: 0x565615be
ESP: 0x6161616d
Exe: '/home/billm/pwntest/crash' (0x56561000)
Fault: 0x6161616d
Traceback (most recent call last):
File "demo.py", line 13, in
assert pack(core.eip) in payload
AssertionError

The assertion is bad...but at least now pwntools can read the core file.

[zachriggle]

Fixed with 7467402e, will cut a new release today