Skip to content
Permalink
Browse files

Merge branch 'beta' into dev

  • Loading branch information
Arusekk committed Jan 22, 2020
2 parents 433d926 + d82bab2 commit 42abafdd418c5d57b2449e9c79488106efed7b00
Showing with 22 additions and 5 deletions.
  1. +10 −2 CHANGELOG.md
  2. +1 −1 README.md
  3. +1 −0 docs/requirements.txt
  4. +8 −1 pwnlib/rop/rop.py
  5. +2 −1 setup.py
@@ -11,7 +11,8 @@ The table below shows which release corresponds to each branch, and what date th
| ---------------- | -------- | ---------------------- |
| [4.2.0](#420) | `dev` | Feb 10, 2020 (planned)
| [4.1.0](#410) | `beta` | Jan 30, 2020 (planned)
| [4.0.0](#400) | `stable` | Jan 09, 2020
| [4.0.1](#401) | `stable` | Jan 22, 2020
| [4.0.0](#400) | | Jan 09, 2020
| [3.13.0](#3130) | | Nov 5, 2019
| [3.12.1](#3121) | | Sept 17, 2018
| [3.12.0](#3120) | | Feb 22, 2018
@@ -63,7 +64,14 @@ To be released on Jan 30, 2020.
[1241]: https://github.com/Gallopsled/pwntools/pulls/1218
[1218]: https://github.com/Gallopsled/pwntools/pulls/1218

## 4.0.0 (`stable`)
## 4.0.1 (`stable`)

- [#1412][1412] `recvline_pred()` and similar do not reorder data
- Bypass unicorn-engine/unicorn#1100 and unicorn-engine/unicorn#1170 requiring unstable package

[1412]: https://github.com/Gallopsled/pwntools/pulls/1412

## 4.0.0

- **Python 3 support! <3**
- [#1402][1402] Fix serialtube in python 3
@@ -2,7 +2,7 @@
![pwntools logo](https://github.com/Gallopsled/pwntools/blob/stable/docs/source/logo.png?raw=true)

[![Docs](https://readthedocs.org/projects/pwntools/badge/?version=stable)](https://docs.pwntools.com/)
[![PyPI](https://img.shields.io/badge/pypi-v3.13.0-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
[![PyPI](https://img.shields.io/pypi/v/pwntools?style=flat)](https://pypi.python.org/pypi/pwntools/)
[![Travis](https://travis-ci.org/Gallopsled/pwntools.svg)](https://travis-ci.org/Gallopsled/pwntools)
[![Coveralls](https://img.shields.io/coveralls/Gallopsled/pwntools/dev.svg)](https://coveralls.io/github/Gallopsled/pwntools?branch=dev)
[![Twitter](https://img.shields.io/badge/twitter-pwntools-4099FF.svg?style=flat)](https://twitter.com/pwntools)
@@ -7,6 +7,7 @@ paramiko>=1.15.2
pip>=6.0.8
pyelftools>=0.2.3
pygments>=2.0
pypandoc
pyserial>=2.7
requests>=2.5.1
ropgadget>=5.3
@@ -277,6 +277,7 @@
import itertools
import os
import re
import shutil
import six
import string
import sys
@@ -1060,13 +1061,19 @@ def __get_cachefile_name(self, files):

return os.path.join(cachedir, sha256.hexdigest())

@staticmethod
def clear_cache():
"""Clears the ROP gadget cache"""
cachedir = os.path.join(tempfile.gettempdir(), 'pwntools-rop-cache')
shutil.rmtree(cachedir)

def __cache_load(self, elf):
filename = self.__get_cachefile_name(elf)
if not os.path.exists(filename):
return None
log.info_once('Loaded cached gadgets for %r' % elf.file.name)
gadgets = eval(open(filename).read())
gadgets = {k - elf.load_addr + elf.address:v for k, v in gadgets.items()}
log.info_once('Loaded %s cached gadgets for %r', len(gadgets), elf.file.name)
return gadgets

def __cache_save(self, elf, data):
@@ -60,7 +60,8 @@
'psutil>=3.3.0',
'intervaltree>=3.0',
'sortedcontainers',
'unicorn']
'unicorn>=1.0.2rc1', # see unicorn-engine/unicorn#1100, unicorn-engine/unicorn#1170
]

# Check that the user has installed the Python development headers
PythonH = os.path.join(get_python_inc(), 'Python.h')

0 comments on commit 42abafd

Please sign in to comment.
You can’t perform that action at this time.