diff options
Diffstat (limited to 'unicorn_mode')
| -rw-r--r-- | unicorn_mode/UNICORNAFL_VERSION | 2 | ||||
| -rwxr-xr-x | unicorn_mode/build_unicorn_support.sh | 8 | ||||
| -rw-r--r-- | unicorn_mode/samples/persistent/Makefile | 3 | ||||
| -rw-r--r-- | unicorn_mode/samples/persistent/harness.c | 4 | ||||
| -rwxr-xr-x | unicorn_mode/samples/persistent/persistent_target | bin | 0 -> 20048 bytes | |||
| m--------- | unicorn_mode/unicornafl | 0 |
6 files changed, 10 insertions, 7 deletions
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION index 0afcf291..c0cc9e02 100644 --- a/unicorn_mode/UNICORNAFL_VERSION +++ b/unicorn_mode/UNICORNAFL_VERSION @@ -1 +1 @@ -25ae270 +94c1976 diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index 965d7614..aeb26945 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -183,7 +183,7 @@ echo "[*] Attempting to build unicornafl (fingers crossed!)..." $MAKECMD clean # make doesn't seem to work for unicorn # Fixed to 1 core for now as there is a race condition in the makefile -UNICORN_QEMU_FLAGS="--python=$PYTHONBIN" $MAKECMD -j1 || exit 1 +$MAKECMD -j1 || exit 1 echo "[+] Build process successful!" @@ -209,9 +209,9 @@ cd ../samples/simple || exit 1 # Run afl-showmap on the sample application. If anything comes out then it must have worked! unset AFL_INST_RATIO -echo 0 | ../../../afl-showmap -U -m none -t 2000 -q -o .test-instr0 -- $PYTHONBIN simple_test_harness.py ./sample_inputs/sample1.bin || exit 1 +echo 0 | ../../../afl-showmap -U -m none -t 2000 -q -o ./.test-instr0 -- $PYTHONBIN ./simple_test_harness.py ./sample_inputs/sample1.bin || exit 1 -if [ -s .test-instr0 ] +if [ -s ./.test-instr0 ] then echo "[+] Instrumentation tests passed. " @@ -227,6 +227,6 @@ else fi -rm -f .test-instr0 +rm -f ./.test-instr0 exit $RETVAL diff --git a/unicorn_mode/samples/persistent/Makefile b/unicorn_mode/samples/persistent/Makefile index cb491e10..9c7ed7aa 100644 --- a/unicorn_mode/samples/persistent/Makefile +++ b/unicorn_mode/samples/persistent/Makefile @@ -45,3 +45,6 @@ harness: harness.o debug: harness-debug.o ${MYCC} -L${LIBDIR} harness.o ../../unicornafl/libunicornafl.a $(LDFLAGS) -o harness-debug + +fuzz: harness + ../../../afl-fuzz -m none -i sample_inputs -o out -- ./harness @@ diff --git a/unicorn_mode/samples/persistent/harness.c b/unicorn_mode/samples/persistent/harness.c index 02d96e90..3d379f46 100644 --- a/unicorn_mode/samples/persistent/harness.c +++ b/unicorn_mode/samples/persistent/harness.c @@ -151,7 +151,7 @@ static void mem_map_checked(uc_engine *uc, uint64_t addr, size_t size, uint32_t //printf("SIZE %llx, align: %llx\n", size, ALIGNMENT); uc_err err = uc_mem_map(uc, addr, size, mode); if (err != UC_ERR_OK) { - printf("Error mapping %ld bytes at 0x%lx: %s (mode: %d)\n", size, addr, uc_strerror(err), mode); + printf("Error mapping %zu bytes at 0x%llx: %s (mode: %d)\n", size, (unsigned long long) addr, uc_strerror(err), mode); exit(1); } } @@ -213,7 +213,7 @@ int main(int argc, char **argv, char **envp) { // Setup the Stack mem_map_checked(uc, STACK_ADDRESS - STACK_SIZE, STACK_SIZE, UC_PROT_READ | UC_PROT_WRITE); uint64_t stack_val = STACK_ADDRESS; - printf("%lu", stack_val); + printf("%llu", (unsigned long long) stack_val); uc_reg_write(uc, UC_X86_REG_RSP, &stack_val); // reserve some space for our input data diff --git a/unicorn_mode/samples/persistent/persistent_target b/unicorn_mode/samples/persistent/persistent_target new file mode 100755 index 00000000..83421a4f --- /dev/null +++ b/unicorn_mode/samples/persistent/persistent_target Binary files differdiff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl -Subproject 25ae270c1b949a5d1c2c5460b778f0a35bfe67d +Subproject 94c1976975518691a03602f7ec5a817e2f34118 |