about summary refs log tree commit diff
diff options
context:
space:
mode:
authorlazymio <mio@lazym.io>2022-02-14 18:01:37 +0100
committerGitHub <noreply@github.com>2022-02-14 18:01:37 +0100
commit8fc249d210ad49e3dd88d1409877ca64d9884690 (patch)
tree8cc9db25c9b5aff3a9abea7c88f45ba82dad58a8
parentde7058b75b629011246be12b4ae7df1e504925b1 (diff)
downloadafl++-8fc249d210ad49e3dd88d1409877ca64d9884690.tar.gz
Fix sample script for Unicornafl2 (#1329)
* Fix the sample script for Unicornafl2

* Make it compatible with unicornafl1

* Sync to the latest unicornafl

* Update UNICORNAFL_VERSION

* Sync to latest unicornafl to resolve linkage problem

* Switch to ucafl2
-rw-r--r--unicorn_mode/UNICORNAFL_VERSION2
-rw-r--r--unicorn_mode/samples/compcov_x64/compcov_test_harness.py4
-rw-r--r--unicorn_mode/samples/speedtest/python/harness.py4
m---------unicorn_mode/unicornafl0
4 files changed, 5 insertions, 5 deletions
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION
index 4697a492..fe7be8e1 100644
--- a/unicorn_mode/UNICORNAFL_VERSION
+++ b/unicorn_mode/UNICORNAFL_VERSION
@@ -1 +1 @@
-46879845
+a44fa94488d01aba60401ccf81f8bebcce685bf2
diff --git a/unicorn_mode/samples/compcov_x64/compcov_test_harness.py b/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
index 52f0a286..ce96b882 100644
--- a/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
+++ b/unicorn_mode/samples/compcov_x64/compcov_test_harness.py
@@ -19,7 +19,7 @@ import os
 import signal
 
 from unicornafl import *
-from unicornafl.x86_const import *
+from unicorn.x86_const import *
 
 # Path to the file containing the binary to emulate
 BINARY_FILE = os.path.join(
@@ -160,7 +160,7 @@ def main():
     # Emulate the code, allowing it to process the mutated input
 
     print("Starting the AFL fuzz")
-    uc.afl_fuzz(
+    uc_afl_fuzz(uc,
         input_file=args.input_file,
         place_input_callback=place_input_callback,
         exits=[end_address],
diff --git a/unicorn_mode/samples/speedtest/python/harness.py b/unicorn_mode/samples/speedtest/python/harness.py
index 801ef4d1..604adf39 100644
--- a/unicorn_mode/samples/speedtest/python/harness.py
+++ b/unicorn_mode/samples/speedtest/python/harness.py
@@ -20,8 +20,8 @@ import os
 import struct
 
 from unicornafl import *
-from unicornafl.unicorn_const import UC_ARCH_X86, UC_HOOK_CODE, UC_MODE_64
-from unicornafl.x86_const import (
+from unicorn.unicorn_const import UC_ARCH_X86, UC_HOOK_CODE, UC_MODE_64
+from unicorn.x86_const import (
     UC_X86_REG_RAX,
     UC_X86_REG_RDI,
     UC_X86_REG_RIP,
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
-Subproject 468798455a9f9790d2da369a18ed49fda3a64e8
+Subproject a44fa94488d01aba60401ccf81f8bebcce685bf