From b8d3a97a4f460b4e7919aa3f558d2a4d21a6b199 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Tue, 1 Sep 2020 13:08:32 +0200
Subject: build with qemuafl

---
 qemu_mode/update_ref.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100755 qemu_mode/update_ref.sh

(limited to 'qemu_mode/update_ref.sh')

diff --git a/qemu_mode/update_ref.sh b/qemu_mode/update_ref.sh
new file mode 100755
index 00000000..53c004ec
--- /dev/null
+++ b/qemu_mode/update_ref.sh
@@ -0,0 +1,46 @@
+#/bin/sh
+
+##################################################
+# AFL++ internal tool to update qemuafl ref.
+# Usage: ./update_ref.sh <new commit hash>
+# If no commit hash was provided, it'll take HEAD.
+##################################################
+
+UC_VERSION_FILE='./QEMUAFL_VERSION'
+
+NEW_VERSION="$1"
+
+if [ "$NEW_VERSION" = "-h" ]; then
+  echo "Internal script to update bound qemuafl version."
+  echo
+  echo "Usage: ./update_ref.sh <new commit hash>"
+  echo "If no commit hash is provided, will use HEAD."
+  echo "-h to show this help screen."
+  exit 1
+fi
+
+git submodule init && git submodule update || exit 1
+cd ./qemuafl || exit 1
+git fetch origin master 1>/dev/null || exit 1
+git stash 1>/dev/null 2>/dev/null
+git stash drop 1>/dev/null 2>/dev/null
+git checkout master
+
+if [ -z "$NEW_VERSION" ]; then
+  # No version provided, take HEAD.
+  NEW_VERSION=$(git rev-parse --short HEAD)
+fi
+
+if [ -z "$NEW_VERSION" ]; then
+  echo "Error getting version."
+  exit 1
+fi
+
+git checkout "$NEW_VERSION" || exit 1
+
+cd ..
+
+rm "$UC_VERSION_FILE"
+echo "$NEW_VERSION" > "$UC_VERSION_FILE"
+
+echo "Done. New qemuafl version is $NEW_VERSION."
-- 
cgit 1.4.1


From 679b2d63a8a67cbeb4ec7ecb4328496d7854be5f Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Tue, 8 Sep 2020 10:56:37 +0200
Subject: qemuafl + arm

---
 qemu_mode/QEMUAFL_VERSION | 2 +-
 qemu_mode/qemuafl         | 2 +-
 qemu_mode/update_ref.sh   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'qemu_mode/update_ref.sh')

diff --git a/qemu_mode/QEMUAFL_VERSION b/qemu_mode/QEMUAFL_VERSION
index 61bdc9de..ea56b640 100644
--- a/qemu_mode/QEMUAFL_VERSION
+++ b/qemu_mode/QEMUAFL_VERSION
@@ -1 +1 @@
-6fe0b5711d
+eee265a3df
diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl
index 6fe0b571..eee265a3 160000
--- a/qemu_mode/qemuafl
+++ b/qemu_mode/qemuafl
@@ -1 +1 @@
-Subproject commit 6fe0b5711d78b40f8ec3151039bdf5609d2cf49f
+Subproject commit eee265a3df4b3c1acaca2873d1b28f0bd8837da4
diff --git a/qemu_mode/update_ref.sh b/qemu_mode/update_ref.sh
index 53c004ec..13be376f 100755
--- a/qemu_mode/update_ref.sh
+++ b/qemu_mode/update_ref.sh
@@ -25,6 +25,7 @@ git fetch origin master 1>/dev/null || exit 1
 git stash 1>/dev/null 2>/dev/null
 git stash drop 1>/dev/null 2>/dev/null
 git checkout master
+git pull origin master 1>/dev/null || exit 1
 
 if [ -z "$NEW_VERSION" ]; then
   # No version provided, take HEAD.
-- 
cgit 1.4.1