Skip to content

Commit 78df70c

Browse files
Arusekkheapcrash
andauthored
Inform GDB of file when using QEMU (#1630)
* Inform GDB of file when using QEMU Fixes #1625 * Sync CHANGELOG from dev + version bump Co-authored-by: Heap Crash <66139157+heapcrash@users.noreply.github.com>
1 parent b5de88e commit 78df70c

File tree

4 files changed

+46
-9
lines changed

4 files changed

+46
-9
lines changed

CHANGELOG.md

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ The table below shows which release corresponds to each branch, and what date th
99

1010
| Version | Branch | Release Date |
1111
| ---------------- | -------- | ---------------------- |
12-
| [4.3.0](#430) | `dev` | Jun 30, 2020 (planned)
13-
| [4.2.0](#420) | `beta` | Jun 5, 2020 (planned)
14-
| [4.1.1](#411) | `stable` | Jun 3, 2020
12+
| [4.4.0](#440) | `dev` | Sep 1, 2020 (planned)
13+
| [4.3.0](#430) | `beta` | Aug 1, 2020 (planned)
14+
| [4.2.0](#420) | `stable` | Jul 3, 2020 (planned)
15+
| [4.1.7](#417) | | Jun 30, 2020
16+
| [4.1.5](#415) | | Jun 27, 2020
17+
| [4.1.4](#414) | | Jun 26, 2020
18+
| [4.1.3](#413) | | Jun 23, 2020
19+
| [4.1.2](#412) | | Jun 5, 2020
20+
| [4.1.1](#411) | | Jun 3, 2020
1521
| [4.1.0](#410) | | May 8, 2020
1622
| [4.0.1](#401) | | Jan 22, 2020
1723
| [4.0.0](#400) | | Jan 09, 2020
@@ -49,13 +55,41 @@ The table below shows which release corresponds to each branch, and what date th
4955
| [3.0.0](#300) | | Aug 20, 2016
5056
| [2.2.0](#220) | | Jan 5, 2015
5157

52-
## 4.3.0 (`dev`)
58+
## 4.4.0 (`dev`)
5359

54-
To be released on Jun 30, 2020.
60+
- [#1616][1616] Fix `cyclic` cli for 64 bit integers
5561

56-
## 4.2.0 (`beta`)
62+
[1616]: https://github.com/Gallopsled/pwntools/pull/1616
5763

58-
To be released on Jun 5, 2020.
64+
## 4.3.0 (`beta`)
65+
66+
- [#1576][1576] Add `executable=` argument to `ELF.search`
67+
- [#1584][1584] Add `jmp_esp`/`jmp_rsp` attribute to `ROP`
68+
- [#1592][1592] Fix over-verbose logging of process() environment
69+
- [#1593][1593] Colorize output of `pwn template`
70+
- [#1601][1601] Add `pwn version` command line tool
71+
- [#1605][1605] Add to `fiddling.hexdump` a way to suppress the total at the end
72+
- [#1613][1613] Permit `--password` for `pwn template`
73+
- [#1564][1564] Fix `asm()` and `disasm()` for PowerPC64, MIPS64, Sparc64
74+
- [#1621][1621] Permit negative values in flat() and fit()
75+
76+
[1576]: https://github.com/Gallopsled/pwntools/pull/1576
77+
[1584]: https://github.com/Gallopsled/pwntools/pull/1584
78+
[1592]: https://github.com/Gallopsled/pwntools/pull/1592
79+
[1593]: https://github.com/Gallopsled/pwntools/pull/1593
80+
[1601]: https://github.com/Gallopsled/pwntools/pull/1601
81+
[1605]: https://github.com/Gallopsled/pwntools/pull/1605
82+
[1613]: https://github.com/Gallopsled/pwntools/pull/1613
83+
[1564]: https://github.com/Gallopsled/pwntools/pull/1564
84+
[1621]: https://github.com/Gallopsled/pwntools/pull/1621
85+
86+
## 4.2.1 (`stable`)
87+
88+
- [#1625][1625] GDB now properly loads executables with QEMU
89+
90+
[1625]: https://github.com/Gallopsled/pwntools/pull/1625
91+
92+
## 4.2.0
5993

6094
- [#1436][1436] Add ret2dlresolve automation
6195
- [fecf9f] tubes.ssh.process() no longer requires python 2 installed on remote (still requires python, though)

pwnlib/gdb.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,9 @@ def attach(target, gdbscript = '', exe = None, gdb_args = None, ssh = None, sysr
631631
if context.os == 'android':
632632
pre += 'set gnutarget ' + _bfdname() + '\n'
633633

634+
if exe:
635+
pre += 'file %s\n' % exe
636+
634637
# let's see if we can find a pid to attach to
635638
pid = None
636639
if isinstance(target, six.integer_types):

pwnlib/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '4.2.0'
1+
__version__ = '4.2.1'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
name = 'pwntools',
8484
python_requires = '>=2.7',
8585
packages = find_packages(),
86-
version = '4.2.0',
86+
version = '4.2.1',
8787
data_files = [('',
8888
glob.glob('*.md') + glob.glob('*.txt')),
8989
],

0 commit comments

Comments
 (0)