Skip to content

Commit

Permalink
Inform GDB of file when using QEMU (#1630)
Browse files Browse the repository at this point in the history
* Inform GDB of file when using QEMU

Fixes #1625

* Sync CHANGELOG from dev + version bump

Co-authored-by: Heap Crash <[email protected]>
  • Loading branch information
Arusekk and heapcrash authored Jul 11, 2020
1 parent b5de88e commit 78df70c
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 9 deletions.
48 changes: 41 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ The table below shows which release corresponds to each branch, and what date th

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

## 4.3.0 (`dev`)
## 4.4.0 (`dev`)

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

## 4.2.0 (`beta`)
[1616]: https://github.com/Gallopsled/pwntools/pull/1616

To be released on Jun 5, 2020.
## 4.3.0 (`beta`)

- [#1576][1576] Add `executable=` argument to `ELF.search`
- [#1584][1584] Add `jmp_esp`/`jmp_rsp` attribute to `ROP`
- [#1592][1592] Fix over-verbose logging of process() environment
- [#1593][1593] Colorize output of `pwn template`
- [#1601][1601] Add `pwn version` command line tool
- [#1605][1605] Add to `fiddling.hexdump` a way to suppress the total at the end
- [#1613][1613] Permit `--password` for `pwn template`
- [#1564][1564] Fix `asm()` and `disasm()` for PowerPC64, MIPS64, Sparc64
- [#1621][1621] Permit negative values in flat() and fit()

[1576]: https://github.com/Gallopsled/pwntools/pull/1576
[1584]: https://github.com/Gallopsled/pwntools/pull/1584
[1592]: https://github.com/Gallopsled/pwntools/pull/1592
[1593]: https://github.com/Gallopsled/pwntools/pull/1593
[1601]: https://github.com/Gallopsled/pwntools/pull/1601
[1605]: https://github.com/Gallopsled/pwntools/pull/1605
[1613]: https://github.com/Gallopsled/pwntools/pull/1613
[1564]: https://github.com/Gallopsled/pwntools/pull/1564
[1621]: https://github.com/Gallopsled/pwntools/pull/1621

## 4.2.1 (`stable`)

- [#1625][1625] GDB now properly loads executables with QEMU

[1625]: https://github.com/Gallopsled/pwntools/pull/1625

## 4.2.0

- [#1436][1436] Add ret2dlresolve automation
- [fecf9f] tubes.ssh.process() no longer requires python 2 installed on remote (still requires python, though)
Expand Down
3 changes: 3 additions & 0 deletions pwnlib/gdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,9 @@ def attach(target, gdbscript = '', exe = None, gdb_args = None, ssh = None, sysr
if context.os == 'android':
pre += 'set gnutarget ' + _bfdname() + '\n'

if exe:
pre += 'file %s\n' % exe

# let's see if we can find a pid to attach to
pid = None
if isinstance(target, six.integer_types):
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.2.0'
__version__ = '4.2.1'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
name = 'pwntools',
python_requires = '>=2.7',
packages = find_packages(),
version = '4.2.0',
version = '4.2.1',
data_files = [('',
glob.glob('*.md') + glob.glob('*.txt')),
],
Expand Down

0 comments on commit 78df70c

Please sign in to comment.