Skip to content
Permalink
Browse files

switch to trusty build in travis ci and fix some test cases (#1155)

  • Loading branch information...
bruce30262 authored and zachriggle committed May 25, 2018
1 parent 6747356 commit 5ae13e8c8c9225d79c11c1833a4aac75592c54a3
Showing with 17 additions and 5 deletions.
  1. +2 −1 .travis.yml
  2. +3 −1 pwnlib/shellcraft/registers.py
  3. +10 −1 pwnlib/shellcraft/templates/mips/linux/sh.asm
  4. +1 −1 pwnlib/tubes/process.py
  5. +1 −1 travis/install.sh
@@ -1,4 +1,4 @@
dist: precise
dist: trusty
language: python
addons:
apt:
@@ -19,6 +19,7 @@ cache:
- usr
- /home/travis/virtualenv/python2.7.13/lib/python2.7/site-packages/
- /home/travis/virtualenv/python2.7.13/bin/
sudo: required
python:
- "2.7"
before_install:
@@ -40,6 +40,8 @@
'$31': 31, '$ra': 31,
}

mips_list = list(mips)

arm = map('r{}'.format, range(13))
arm += ["sp", "lr", "pc", "cpsr"]

@@ -211,7 +213,7 @@ def current():
'arm': arm,
'thumb': arm,
'aarch64': aarch64,
'mips': mips,
'mips': mips_list,
'powerpc': powerpc
}[context.arch]

@@ -1,4 +1,13 @@
<% from pwnlib.shellcraft import mips %>
<%docstring>Execute /bin/sh</%docstring>
<%docstring>Execute /bin/sh

Example:

>>> p = run_assembly(shellcraft.mips.linux.sh())
>>> p.sendline('echo Hello')
>>> p.recv()
'Hello\n'

</%docstring>

${mips.execve('//bin/sh', ['sh'], {})}
@@ -931,7 +931,7 @@ def leak(self, address, count=1):
Example:
>>> e = ELF('/bin/sh')
>>> e = ELF('/bin/bash')
>>> p = process(e.path)
In order to make sure there's not a race condition against
@@ -11,7 +11,7 @@ local_deb_extract()

install_deb()
{
version=${2:-zesty}
version=${2:-artful}
package=$1
echo "Installing $package"
INDEX="http://packages.ubuntu.com/en/$version/amd64/$package/download"

0 comments on commit 5ae13e8

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