diff --git a/include/libzafl.hpp b/include/libzafl.hpp index a1305259aed5d888b9b5b8b9ac747d0fe21eba90..e2041cff17706511177ce01486814d7ea4da2253 100644 --- a/include/libzafl.hpp +++ b/include/libzafl.hpp @@ -5,8 +5,6 @@ extern "C" { // config.h is a header from the afl distro // make sure afl has been downloaded and AFL_PATH is set properly -#include "config.h" - extern void zafl_initAflForkServer(); extern void zafl_bbInstrument(unsigned short id); diff --git a/src/libzafl.c b/src/libzafl.c index dccfd2dba6e8ee88b27077ead897edc334ebc7f5..7c2016fa95223750fe1f3b236c5048f25371d871 100644 --- a/src/libzafl.c +++ b/src/libzafl.c @@ -20,6 +20,7 @@ #include <stdlib.h> +#include <stdint.h> #include <unistd.h> #include <sys/types.h> #include <sys/shm.h> @@ -27,7 +28,13 @@ #include <stdio.h> #include <string.h> -#include "config.h" +// these must match config.h in AFL source code +#define SHM_ENV_VAR "__AFL_SHM_ID" +#define FORKSRV_FD 198 +#define MAP_SIZE_POW2 16 +#define MAP_SIZE (1 << MAP_SIZE_POW2) +typedef uint8_t u8; +typedef int32_t s32; // externally visible so that Zipr transformations can access directly u8* zafl_trace_map = NULL;