From ce79e3e264dc3e4bb224ae556fdbb70f62eda6fa Mon Sep 17 00:00:00 2001 From: Zach Hanson Date: Sat, 26 Oct 2024 00:44:02 -0700 Subject: [PATCH 1/3] Removed GNU_STACK missing text --- CHANGELOG.md | 8 +++++++- pwnlib/elf/elf.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37b77a9fe..a50532db4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -129,7 +129,13 @@ The table below shows which release corresponds to each branch, and what date th [2435]: https://github.com/Gallopsled/pwntools/pull/2435 [2437]: https://github.com/Gallopsled/pwntools/pull/2437 -## 4.13.1 (`stable`) +## 4.13.2 (`stable`) + +- [#2493][2493] Fix NX message falsely reporting GNU_STACK missing + +[2493]: https://github.com/Gallopsled/pwntools/pull/2493 + +## 4.13.1 - [#2445][2445] Fix parsing the PLT on Windows - [#2466][2466] Fix PLT emulation with Unicorn 2.1.0 diff --git a/pwnlib/elf/elf.py b/pwnlib/elf/elf.py index acb0a2d7a..b93a39389 100644 --- a/pwnlib/elf/elf.py +++ b/pwnlib/elf/elf.py @@ -2074,7 +2074,7 @@ def checksec(self, banner=True, color=True): "NX:".ljust(12) + { True: green("NX enabled"), False: red("NX disabled"), - None: yellow("NX unknown - GNU_STACK missing"), + None: yellow("NX unknown"), }[self.nx], "PIE:".ljust(12) + { True: green("PIE enabled"), From 16a769eafbc55cb0b3253508255ad8348298ff95 Mon Sep 17 00:00:00 2001 From: Arusekk Date: Mon, 3 Mar 2025 15:50:08 +0100 Subject: [PATCH 2/3] Update pwnlib/elf/elf.py --- pwnlib/elf/elf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwnlib/elf/elf.py b/pwnlib/elf/elf.py index b93a39389..17cfc5d71 100644 --- a/pwnlib/elf/elf.py +++ b/pwnlib/elf/elf.py @@ -2074,7 +2074,7 @@ def checksec(self, banner=True, color=True): "NX:".ljust(12) + { True: green("NX enabled"), False: red("NX disabled"), - None: yellow("NX unknown"), + None: yellow("NX enabled on new kernels"), }[self.nx], "PIE:".ljust(12) + { True: green("PIE enabled"), From 60956ef257776073d2333e8664d784d4d86efa3e Mon Sep 17 00:00:00 2001 From: Arusekk Date: Mon, 3 Mar 2025 16:02:02 +0100 Subject: [PATCH 3/3] Message fix: changelog not needed --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a50532db4..37b77a9fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -129,13 +129,7 @@ The table below shows which release corresponds to each branch, and what date th [2435]: https://github.com/Gallopsled/pwntools/pull/2435 [2437]: https://github.com/Gallopsled/pwntools/pull/2437 -## 4.13.2 (`stable`) - -- [#2493][2493] Fix NX message falsely reporting GNU_STACK missing - -[2493]: https://github.com/Gallopsled/pwntools/pull/2493 - -## 4.13.1 +## 4.13.1 (`stable`) - [#2445][2445] Fix parsing the PLT on Windows - [#2466][2466] Fix PLT emulation with Unicorn 2.1.0