From 01e294aed3f32058c28e7f489184b29f9486126b Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Fri, 28 Nov 2014 19:13:35 -0500
Subject: [PATCH] [test suite] use -A mode for AFL fuzzing, make sure fwknopd
 does not init digest cache in -A mode

---
 server/fwknopd.c                                        | 3 +++
 test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh | 2 +-
 test/afl/fuzzing-wrappers/server-access.sh              | 2 +-
 test/afl/fuzzing-wrappers/server-conf.sh                | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/fwknopd.c b/server/fwknopd.c
index adb2421e..e164a82c 100644
--- a/server/fwknopd.c
+++ b/server/fwknopd.c
@@ -347,6 +347,9 @@ static void init_digest_cache(fko_srv_options_t *opts)
 {
     int     rp_cache_count;
 
+    if(opts->afl_fuzzing)
+        return;
+
     if(strncasecmp(opts->config[CONF_ENABLE_DIGEST_PERSISTENCE], "Y", 1) == 0)
     {
         rp_cache_count = replay_cache_init(opts);
diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
index afa1c9f3..a463a6c1 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-conf.sh
@@ -11,6 +11,6 @@ LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd \
     -c $FWKNOPD_CONF_FILE \
     -a ../conf/default_access.conf \
     -O ../conf/override_no_digest_tracking_fwknopd.conf \
-    -f -t --exit-parse-config -v -v -v -r `pwd`/run
+    -A -f -t --exit-parse-config -v -v -v -r `pwd`/run
 
 exit $?
diff --git a/test/afl/fuzzing-wrappers/server-access.sh b/test/afl/fuzzing-wrappers/server-access.sh
index e1c476c3..020f1432 100755
--- a/test/afl/fuzzing-wrappers/server-access.sh
+++ b/test/afl/fuzzing-wrappers/server-access.sh
@@ -36,6 +36,6 @@ LD_LIBRARY_PATH=$LIB_DIR afl-fuzz \
     -c ../conf/ipt_snat_fwknopd.conf \
     -a $OUT_DIR/afl_access.conf \
     -O ../conf/override_no_digest_tracking_fwknopd.conf \
-    -f -t --exit-parse-config -v -v -v -r `pwd`/run
+    -A -f -t --exit-parse-config -v -v -v -r `pwd`/run
 
 exit $?
diff --git a/test/afl/fuzzing-wrappers/server-conf.sh b/test/afl/fuzzing-wrappers/server-conf.sh
index 0601c5b5..c8e29c8f 100755
--- a/test/afl/fuzzing-wrappers/server-conf.sh
+++ b/test/afl/fuzzing-wrappers/server-conf.sh
@@ -31,9 +31,9 @@ fi
 
 LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -T $BANNER -t 1000 -i $IN_DIR \
     -o $OUT_DIR -f $OUT_DIR/afl_fwknopd.conf $SERVER \
-    -c $OUT_DIR/afl_fwknopd.conf \
-    -a $OUT_DIR/afl_access.conf \
     -O ../conf/override_no_digest_tracking_fwknopd.conf \
-    -f -t --exit-parse-config -v -v -v -r `pwd`/run
+    -a ../conf/default_access.conf \
+    -c $OUT_DIR/afl_fwknopd.conf \
+    -A -f -t --exit-parse-config -v -v -v -r `pwd`/run
 
 exit $?