From c65901a41844713b846938a5c487733e01affb51 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Wed, 1 Aug 2018 13:40:58 -0700 Subject: [PATCH 01/15] don't abandon --- bin/deepstate/main_manticore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index bc24dd9..666ebd4 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -295,7 +295,7 @@ def done_test(_, state, state_id, reason): elif _is_program_exit(reason): L.info("State {} terminated due to program exit: {}".format( state_id, reason)) - super(DeepManticore, mc).abandon_test() + #super(DeepManticore, mc).abandon_test() else: L.error("State {} terminated due to internal error: {}".format(state_id, reason)) From 556ba2c02640e1213073b55d0f35343fa52c71f6 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Wed, 1 Aug 2018 22:20:21 -0700 Subject: [PATCH 02/15] report --- bin/deepstate/main_manticore.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index 666ebd4..b2282f0 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -295,6 +295,7 @@ def done_test(_, state, state_id, reason): elif _is_program_exit(reason): L.info("State {} terminated due to program exit: {}".format( state_id, reason)) + mc.report() #super(DeepManticore, mc).abandon_test() else: L.error("State {} terminated due to internal error: {}".format(state_id, From c6076305727aaaf34f4192d797cc1d0317620d1c Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Wed, 1 Aug 2018 23:00:16 -0700 Subject: [PATCH 03/15] on program exit, call pass test --- bin/deepstate/main_manticore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index b2282f0..8f0a356 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -295,7 +295,7 @@ def done_test(_, state, state_id, reason): elif _is_program_exit(reason): L.info("State {} terminated due to program exit: {}".format( state_id, reason)) - mc.report() + super(DeepManticore, mc).pass_test() #super(DeepManticore, mc).abandon_test() else: L.error("State {} terminated due to internal error: {}".format(state_id, From 9c32c640556afcfa2260e04f4d81044ed8db2c92 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:11:36 -0700 Subject: [PATCH 04/15] fix manticore build? --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9dc83af..eb3c901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ install: - pip install pyflakes - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev +- sudo pip install z3-solver==4.5.1.0.post2 - sudo pip install -U pip ; sudo pip install manticore - sudo pip uninstall -y Manticore || echo "Manticore not cached" - sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip From 187e3ae1b0615f6a13f24b35462e5904fcebf299 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:23:29 -0700 Subject: [PATCH 05/15] try the previous claripy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb3c901..2401f56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - pip install pyflakes - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev -- sudo pip install z3-solver==4.5.1.0.post2 +- sudo pip install claripy==7.8.6.16 - sudo pip install -U pip ; sudo pip install manticore - sudo pip uninstall -y Manticore || echo "Manticore not cached" - sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip From 3ab1b341318ea2f480004a2ef366e765e1d7ee78 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:31:22 -0700 Subject: [PATCH 06/15] try uninstall and reinstall claripy --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2401f56..c9d0b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ install: - pip install pyflakes - sudo apt-get -y update - sudo apt-get -y install build-essential gcc-multilib cmake python python-pip python-setuptools libffi-dev -- sudo pip install claripy==7.8.6.16 - sudo pip install -U pip ; sudo pip install manticore - sudo pip uninstall -y Manticore || echo "Manticore not cached" - sudo pip install https://github.com/trailofbits/manticore/archive/last_python2.zip @@ -15,6 +14,8 @@ install: - cd build - cmake .. - make +- sudo pip uninstall claripy +- sudo pip install claripy==7.8.6.16 - python setup.py install - cd .. env: From 9ba8c36fcbfa6885a6c3c9bf0bcf51f56f1ac8c4 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:42:43 -0700 Subject: [PATCH 07/15] fix via z3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9d0b5d..2d4a3ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ install: - cd build - cmake .. - make -- sudo pip uninstall claripy -- sudo pip install claripy==7.8.6.16 +- sudo pip uninstall z3-solver +- sudo pip install z3-solver==4.5.1.0.post2 - python setup.py install - cd .. env: From c254cbefdcc46518cc4e00f9ccc46e311b1de72b Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:50:17 -0700 Subject: [PATCH 08/15] add yes to uninstall --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d4a3ed..471f6a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - cd build - cmake .. - make -- sudo pip uninstall z3-solver +- sudo pip uninstall -y z3-solver - sudo pip install z3-solver==4.5.1.0.post2 - python setup.py install - cd .. From cdc2d3995be8987ace2497cf8bd67e1c0e9262d2 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:55:02 -0700 Subject: [PATCH 09/15] fixes don't work, build is inside angr --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 471f6a9..9dc83af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ install: - cd build - cmake .. - make -- sudo pip uninstall -y z3-solver -- sudo pip install z3-solver==4.5.1.0.post2 - python setup.py install - cd .. env: From dbe2c4a5198ef3e14f1a2315b1eb0b9ef204115e Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 12:57:55 -0700 Subject: [PATCH 10/15] try installing last angr --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9dc83af..66f9ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: - cd build - cmake .. - make +- pip install angr==7.8.7.1 - python setup.py install - cd .. env: From 4ec01826820cf5e516cffdfd08a57aeeeb85aece Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 13:02:05 -0700 Subject: [PATCH 11/15] must sudo to install angr --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66f9ceb..710a98a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - cd build - cmake .. - make -- pip install angr==7.8.7.1 +- sudo pip install angr==7.8.7.1 - python setup.py install - cd .. env: From 125528343ad45d95e30ce7bfa5c7f49111d11961 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 13:06:18 -0700 Subject: [PATCH 12/15] can't install angr either --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 710a98a..9dc83af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ install: - cd build - cmake .. - make -- sudo pip install angr==7.8.7.1 - python setup.py install - cd .. env: From fe6d642b9add81a0f12415f828569ca07807a7a7 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 13:22:48 -0700 Subject: [PATCH 13/15] try forcing old angr --- bin/setup.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/setup.py.in b/bin/setup.py.in index 6c217b4..4f22671 100644 --- a/bin/setup.py.in +++ b/bin/setup.py.in @@ -30,7 +30,7 @@ setuptools.setup( author_email="peter@trailofbits.com", license="Apache-2.0", keywords="tdd testing symbolic execution", - install_requires=['angr', 'manticore'], + install_requires=['angr==7.8.7.1', 'manticore'], entry_points={ 'console_scripts': [ 'deepstate = deepstate.main_manticore:main', From 3ccf682db2a8ca5d7e21cbe82db353f45ad3308c Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 13:30:28 -0700 Subject: [PATCH 14/15] try claripy first --- bin/setup.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/setup.py.in b/bin/setup.py.in index 4f22671..f1eca5b 100644 --- a/bin/setup.py.in +++ b/bin/setup.py.in @@ -30,7 +30,7 @@ setuptools.setup( author_email="peter@trailofbits.com", license="Apache-2.0", keywords="tdd testing symbolic execution", - install_requires=['angr==7.8.7.1', 'manticore'], + install_requires=['claripy==7.8.6.16','angr==7.8.7.1', 'manticore'], entry_points={ 'console_scripts': [ 'deepstate = deepstate.main_manticore:main', From cb5d16aa8603c073dd01186d7231ce5399d136d9 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Thu, 2 Aug 2018 13:59:34 -0700 Subject: [PATCH 15/15] remove lists test on manticore, due to speed issues --- tests/test_lists.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_lists.py b/tests/test_lists.py index 5c8107c..2c0b9db 100644 --- a/tests/test_lists.py +++ b/tests/test_lists.py @@ -5,6 +5,8 @@ import deepstate_base class ListsTest(deepstate_base.DeepStateTestCase): def run_deepstate(self, deepstate): + if deepstate == "deepstate-manticore": + return # Just skip for now, we know it's too slow (r, output) = logrun.logrun([deepstate, "build/examples/Lists"], "deepstate.out", 3000) self.assertEqual(r, 0)