From d568559f01b1a7609f8a0c4f7afea513375725e4 Mon Sep 17 00:00:00 2001
From: h1994st <h1994st@gmail.com>
Date: Fri, 27 Mar 2020 21:03:06 -0400
Subject: Fix typo

---
 examples/custom_mutators/example.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'examples/custom_mutators/example.py')

diff --git a/examples/custom_mutators/example.py b/examples/custom_mutators/example.py
index 6bacfa05..6b58188e 100644
--- a/examples/custom_mutators/example.py
+++ b/examples/custom_mutators/example.py
@@ -164,11 +164,10 @@ def fuzz(buf, add_buf, max_size):
 #     '''
 #     Called after adding a new test case to the queue
 #
-#     @type filename_new_queue: str 
+#     @type filename_new_queue: str
 #     @param filename_new_queue: File name of the new queue entry
 #
 #     @type filename_orig_queue: str
 #     @param filename_orig_queue: File name of the original queue entry
 #     '''
 #     pass
-
-- 
cgit 1.4.1


From 71edae4a0fd7ca64a6f2c87768d14136ac04b0a1 Mon Sep 17 00:00:00 2001
From: h1994st <h1994st@gmail.com>
Date: Sun, 29 Mar 2020 01:06:28 -0400
Subject: example.py: add deinit()

---
 examples/custom_mutators/example.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'examples/custom_mutators/example.py')

diff --git a/examples/custom_mutators/example.py b/examples/custom_mutators/example.py
index 6b58188e..7919d3d3 100644
--- a/examples/custom_mutators/example.py
+++ b/examples/custom_mutators/example.py
@@ -27,6 +27,10 @@ def init(seed):
     random.seed(seed)
 
 
+def deinit():
+    pass
+
+
 def fuzz(buf, add_buf, max_size):
     '''
     Called per fuzzing iteration.
-- 
cgit 1.4.1


From 64e1d3a975b5d4f017fabdc921cb59128db1c18a Mon Sep 17 00:00:00 2001
From: h1994st <h1994st@gmail.com>
Date: Sun, 29 Mar 2020 01:22:44 -0400
Subject: test.sh: "trusty-amd64" does not work well with "realpath". Use
 "readlink -f" for Ubuntu instead.

---
 examples/custom_mutators/example.py | 12 ++++++++++--
 test/test.sh                        | 16 ++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'examples/custom_mutators/example.py')

diff --git a/examples/custom_mutators/example.py b/examples/custom_mutators/example.py
index 7919d3d3..9e95eed6 100644
--- a/examples/custom_mutators/example.py
+++ b/examples/custom_mutators/example.py
@@ -17,6 +17,13 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import random
 
 
+COMMANDS = [
+    b"GET",
+    b"PUT",
+    b"DEL",
+]
+
+
 def init(seed):
     '''
     Called once when AFLFuzz starts up. Used to seed our RNG.
@@ -48,8 +55,9 @@ def fuzz(buf, add_buf, max_size):
     @rtype: bytearray
     @return: A new bytearray containing the mutated data
     '''
-    ret = bytearray(buf)
-    # Do something interesting with ret
+    ret = bytearray(100)
+
+    ret[:3] = random.choice(COMMANDS)
 
     return ret
 
diff --git a/test/test.sh b/test/test.sh
index 11c4be25..c9ce3489 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -894,9 +894,13 @@ test -d ../unicorn_mode/unicornafl && {
 }
 
 $ECHO "$BLUE[*] Testing: custom mutator"
-unset AFL_CC  # Line 474 sets AFL_CC to "gcc". We reset it to use the default compiler
-CUSTOM_MUTATOR_PATH=$( realpath ../examples/custom_mutators )
-test -e test-custom-mutator.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c && {
+unset AFL_CC  # Test case "gcc_plugin" sets AFL_CC to "gcc". We reset it to use the default compiler
+test `uname -s` = 'Darwin' && {
+  CUSTOM_MUTATOR_PATH=$( realpath ../examples/custom_mutators )
+} || {
+  CUSTOM_MUTATOR_PATH=$( readlink -f ../examples/custom_mutators )
+}
+test -e test-custom-mutator.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c -a -e ${CUSTOM_MUTATOR_PATH}/example.py && {
   # Compile the vulnerable program
   ../afl-clang-fast -o test-custom-mutator test-custom-mutator.c > /dev/null 2>&1
   # Compile the custom mutator
@@ -904,7 +908,7 @@ test -e test-custom-mutator.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c -a -e ${CUS
   test -e test-custom-mutator -a -e ${CUSTOM_MUTATOR_PATH}/libexamplemutator.so && {
     # Create input directory
     mkdir -p in
-    echo 00000 > in/in
+    echo "00000" > in/in
 
     # Run afl-fuzz w/ the C mutator
     $ECHO "$GREY[*] running afl-fuzz for the C mutator, this will take approx 10 seconds"
@@ -915,7 +919,7 @@ test -e test-custom-mutator.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c -a -e ${CUS
     } >>errors 2>&1
 
     # Check results
-    test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {  # TODO: update here
+    test -n "$( ls out/crashes/id:000000* 2>/dev/null )" && {  # TODO: update here
       $ECHO "$GREEN[+] afl-fuzz is working correctly with the C mutator"
     } || {
       echo CUT------------------------------------------------------------------CUT
@@ -939,7 +943,7 @@ test -e test-custom-mutator.c -a -e ${CUSTOM_MUTATOR_PATH}/example.c -a -e ${CUS
     } >>errors 2>&1
 
     # Check results
-    test -n "$( ls out/queue/id:000001* 2>/dev/null )" && {  # TODO: update here
+    test -n "$( ls out/crashes/id:000000* 2>/dev/null )" && {  # TODO: update here
       $ECHO "$GREEN[+] afl-fuzz is working correctly with the Python mutator"
     } || {
       echo CUT------------------------------------------------------------------CUT
-- 
cgit 1.4.1