about summary refs log tree commit diff
path: root/unicorn_mode
diff options
context:
space:
mode:
Diffstat (limited to 'unicorn_mode')
-rw-r--r--unicorn_mode/README.md4
-rw-r--r--unicorn_mode/UNICORNAFL_VERSION2
-rwxr-xr-xunicorn_mode/build_unicorn_support.sh12
-rw-r--r--unicorn_mode/helper_scripts/unicorn_loader.py2
-rw-r--r--unicorn_mode/samples/c/sample_all.sh4
m---------unicorn_mode/unicornafl0
6 files changed, 12 insertions, 12 deletions
diff --git a/unicorn_mode/README.md b/unicorn_mode/README.md
index ce87a2e9..69ccc476 100644
--- a/unicorn_mode/README.md
+++ b/unicorn_mode/README.md
@@ -144,7 +144,7 @@ The following examples exist at the time of writing:
   blocks
 - persistent: A C example using persistent mode for maximum speed, and resetting
   the target state between each iteration
-- simple: A simple Python example
+- python_simple: A simple Python example
 - speedtest/c: The C harness for an example target, used to compare C, Python,
   and Rust bindings and fix speed issues
 - speedtest/python: Fuzzing the same target in Python
@@ -158,4 +158,4 @@ get shipped pre-built (plus their source).
 
 Especially take a look at the
 [speedtest documentation](./samples/speedtest/README.md) to see how the
-languages compare.
\ No newline at end of file
+languages compare.
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION
index deac0bf9..00a2aba3 100644
--- a/unicorn_mode/UNICORNAFL_VERSION
+++ b/unicorn_mode/UNICORNAFL_VERSION
@@ -1 +1 @@
-4b4fdab1
+1c58dc97
diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh
index 097a2dc9..1be399ff 100755
--- a/unicorn_mode/build_unicorn_support.sh
+++ b/unicorn_mode/build_unicorn_support.sh
@@ -199,26 +199,26 @@ echo "[+] Build process successful!"
 
 echo "[*] Installing Unicorn python bindings..."
 XOPT=
-$PYTHONBIN -m pip install --help 2>/dev/null | grep -q break-system-packages && XOPT=--break-system-packages
+#$PYTHONBIN -m pip install --help 2>/dev/null | grep -q break-system-packages && XOPT=--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 .`'
+echo '[*] If needed, you can (re)install the bindings in `./unicornafl/bindings/python` using `python setup.py install --force .`'
 
 cd ../../ || exit 1
 
diff --git a/unicorn_mode/helper_scripts/unicorn_loader.py b/unicorn_mode/helper_scripts/unicorn_loader.py
index a83e7000..4219c6ab 100644
--- a/unicorn_mode/helper_scripts/unicorn_loader.py
+++ b/unicorn_mode/helper_scripts/unicorn_loader.py
@@ -90,7 +90,7 @@ class UnicornSimpleHeap(object):
     _chunks_freed = [] # List of all freed chunks
     _debug_print = False  # True to print debug information
 
-    def __init__(self, uc, debug_print=False, uaf_check=False):
+    def __init__(self, uc, debug_print=False, uaf_check=False):
         self._uc = uc
         self._debug_print = debug_print
 
diff --git a/unicorn_mode/samples/c/sample_all.sh b/unicorn_mode/samples/c/sample_all.sh
index 01daf365..3bb396e7 100644
--- a/unicorn_mode/samples/c/sample_all.sh
+++ b/unicorn_mode/samples/c/sample_all.sh
@@ -12,7 +12,7 @@ fi
 
 
 
-if [ ! test -e $DIR/harness]; then
+if [ ! -e $DIR/harness ]; then
   echo "[!] harness not found in $DIR"
   exit 1
-fi
\ No newline at end of file
+fi
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
-Subproject 4b4fdab161c15529affcc1e785d779e318b882a
+Subproject 1c58dc9774012bace730df5c1c273356762e848