From 5755aabaeee49dc56732d9c30460828dff485257 Mon Sep 17 00:00:00 2001 From: disconnect3d Date: Thu, 28 Sep 2023 19:39:29 +0200 Subject: [PATCH] Fixes 1777: update Pwntools to 4.11 --- pwndbg/gdblib/arch.py | 19 ++----------------- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pwndbg/gdblib/arch.py b/pwndbg/gdblib/arch.py index 90866cac2..7e0bc25fa 100644 --- a/pwndbg/gdblib/arch.py +++ b/pwndbg/gdblib/arch.py @@ -21,25 +21,10 @@ pwnlib_archs_mapping = { "sparc": "sparc", "arm": "arm", "armcm": "thumb", + "rv32": "riscv32", + "rv64": "riscv64", } -# https://github.com/Gallopsled/pwntools/pull/2177 -pwnlib_version = list(map(int, pwnlib.__version__.split(".")[:2])) -if pwnlib_version[0] == 4 and pwnlib_version[1] < 11: - pwnlib_archs_mapping.update( - { - "rv32": "riscv", - "rv64": "riscv", - } - ) -else: - pwnlib_archs_mapping.update( - { - "rv32": "riscv32", - "rv64": "riscv64", - } - ) - arch = Arch("i386", typeinfo.ptrsize, "little") diff --git a/pyproject.toml b/pyproject.toml index 3af5fe3db..75f7ec06d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -262,7 +262,7 @@ packages = [ python = "^3.8" capstone = "5.0.0.post1" psutil = "5.9.5" -pwntools = "4.10.0" +pwntools = "4.11.0" pycparser = "2.21" pyelftools = "0.29" pygments = "2.15.0"