From 7b2f983bf3d9f7854891eda5692a3cf8afdf1650 Mon Sep 17 00:00:00 2001 From: aarnav Date: Tue, 13 Aug 2024 16:40:52 +0200 Subject: fix unicorn and unicornafl build script --- unicorn_mode/build_unicorn_support.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index 097a2dc9..68f7eac2 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -203,20 +203,20 @@ $PYTHONBIN -m pip install --help 2>/dev/null | grep -q break-system-packages && cd unicorn/bindings/python || exit 1 if [ -z "$VIRTUAL_ENV" ]; then echo "[*] Info: Installing python unicornafl using --user" - THREADS=$CORES $PYTHONBIN -m pip install --user $XOPT --force .|| exit 1 + THREADS=$CORES $PYTHONBIN setup.py install --user $XOPT --force || exit 1 else echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV" - THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1 + THREADS=$CORES $PYTHONBIN setup.py install --force || exit 1 fi cd ../../../ echo "[*] Installing Unicornafl python bindings..." cd bindings/python || exit 1 if [ -z "$VIRTUAL_ENV" ]; then echo "[*] Info: Installing python unicornafl using --user" - THREADS=$CORES $PYTHONBIN -m pip install --user $XOPT --force .|| exit 1 + THREADS=$CORES $PYTHONBIN setup.py install --user $XOPT --force || exit 1 else echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV" - THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1 + THREADS=$CORES $PYTHONBIN setup.py install --force || exit 1 fi echo '[*] If needed, you can (re)install the bindings in `./unicornafl/bindings/python` using `pip install --force .`' -- cgit 1.4.1 From d78a8698e48dadaac4f0763d9375346639d48203 Mon Sep 17 00:00:00 2001 From: aarnav Date: Tue, 13 Aug 2024 16:56:22 +0200 Subject: fix rebuild message --- unicorn_mode/build_unicorn_support.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index 68f7eac2..a21d05eb 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -218,7 +218,7 @@ else echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV" THREADS=$CORES $PYTHONBIN setup.py install --force || exit 1 fi -echo '[*] If needed, you can (re)install the bindings in `./unicornafl/bindings/python` using `pip install --force .`' +echo '[*] If needed, you can (re)install the bindings in `./unicornafl/bindings/python` using `python setup.py install --force .`' cd ../../ || exit 1 -- cgit 1.4.1 From 91110354950ff36bb6c7cb10b71d2540c7756d98 Mon Sep 17 00:00:00 2001 From: aarnav Date: Wed, 14 Aug 2024 13:44:23 +0200 Subject: fix incorrect check for unicorn CI --- test/test-unicorn-mode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-unicorn-mode.sh b/test/test-unicorn-mode.sh index 338c5982..99bfebdc 100755 --- a/test/test-unicorn-mode.sh +++ b/test/test-unicorn-mode.sh @@ -35,7 +35,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/Makefile && make >>errors 2>&1 $ECHO "$GREY[*] running afl-fuzz for unicorn_mode (persistent), this will take approx 25 seconds" AFL_DEBUG_CHILD=1 ../../../afl-fuzz -m none -V15 -U -i sample_inputs -o out -d -- ./harness @@ >>errors 2>&1 - test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && { + test -n "$( ls out/default/queue/id:000006* 2>/dev/null )" && { $ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode (persistent)" } || { echo CUT------------------------------------------------------------------CUT -- cgit 1.4.1 From db84f75a813345783993285fa2780885a70c46a6 Mon Sep 17 00:00:00 2001 From: aarnav Date: Wed, 14 Aug 2024 13:45:10 +0200 Subject: remove deprecated -d option in unicorn CI test --- test/test-unicorn-mode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-unicorn-mode.sh b/test/test-unicorn-mode.sh index 99bfebdc..9a290bb5 100755 --- a/test/test-unicorn-mode.sh +++ b/test/test-unicorn-mode.sh @@ -34,7 +34,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/Makefile && cd ../unicorn_mode/samples/persistent make >>errors 2>&1 $ECHO "$GREY[*] running afl-fuzz for unicorn_mode (persistent), this will take approx 25 seconds" - AFL_DEBUG_CHILD=1 ../../../afl-fuzz -m none -V15 -U -i sample_inputs -o out -d -- ./harness @@ >>errors 2>&1 + AFL_DEBUG_CHILD=1 ../../../afl-fuzz -m none -V15 -U -i sample_inputs -o out -- ./harness @@ >>errors 2>&1 test -n "$( ls out/default/queue/id:000006* 2>/dev/null )" && { $ECHO "$GREEN[+] afl-fuzz is working correctly with unicorn_mode (persistent)" } || { -- cgit 1.4.1