afl: add --enable-afl configure option

diff --git a/configure.ac b/configure.ac
index e9de6f2d12cf6b16da62fdfbdd09e5aeba9b2f9c..21e07fc40b9672c336b537d98d7f29a14df8c6e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,16 @@
     esac
     AC_MSG_RESULT(ok)
 
+  # enable modifications for AFL fuzzing
+    AC_ARG_ENABLE(afl,
+           AS_HELP_STRING([--enable-afl], Enable AFL fuzzing logic[])], [enable_afl="$enableval"],[enable_afl=no])
+    AS_IF([test "x$enable_afl" = "xyes"], [
+            AC_DEFINE([AFLFUZZ_NO_RANDOM], [1], [Disable all use of random functions])
+            AC_DEFINE([AFLFUZZ_DISABLE_MGTTHREADS], [1], [Disable all management threads])
+            AC_DEFINE([AFLFUZZ_PCAP_RUNMODE], [1], [Enable special AFL 'single' runmode])
+            AC_DEFINE([AFLFUZZ_CONF_TEST], [1], [Enable special --afl-parse-rules commandline option])
+    ])
+
   # disable TLS on user request
     AC_ARG_ENABLE(threading-tls,
            AS_HELP_STRING([--disable-threading-tls], [Disable TLS (thread local storage)]), [enable_tls="$enableval"],[enable_tls=yes])

diff --git a/src/suricata-common.h b/src/suricata-common.h
index ea97b3303b4ae9cf700efb08aa49ee81e15975d8..18791c3b04bcd59537082e121dcf842e7e16c134 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -228,11 +228,6 @@
 #endif
 #endif
 
-#define AFLFUZZ_NO_RANDOM 1
-#define AFLFUZZ_DISABLE_MGTTHREADS 1
-#define AFLFUZZ_PCAP_RUNMODE 1
-#define AFLFUZZ_CONF_TEST 1
-
 /* we need this to stringify the defines which are supplied at compiletime see:
    http://gcc.gnu.org/onlinedocs/gcc-3.4.1/cpp/Stringification.html#Stringification */
 #define xstr(s) str(s)