diff options
| author | van Hauser <vh@thc.org> | 2022-03-17 16:30:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 16:30:29 +0100 |
| commit | 1bea949f34fb437a60ca772787a9018a3ba79053 (patch) | |
| tree | 59d6f7ef2222cb92835d08398de3a1d32d2f8528 /include | |
| parent | 3c11a377570512efeb3a197148ff1b7dddbd8e32 (diff) | |
| parent | 1a65df2beee0a68bd5198a44f42ae1346f7ee231 (diff) | |
| download | afl++-1bea949f34fb437a60ca772787a9018a3ba79053.tar.gz | |
Merge branch 'dev' into newpm2
Diffstat (limited to 'include')
| -rw-r--r-- | include/envs.h | 2 | ||||
| -rw-r--r-- | include/forkserver.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/envs.h b/include/envs.h index 1f6d33e6..fc276f8f 100644 --- a/include/envs.h +++ b/include/envs.h @@ -57,10 +57,12 @@ static char *afl_environment_variables[] = { "AFL_FRIDA_DEBUG_MAPS", "AFL_FRIDA_DRIVER_NO_HOOK", "AFL_FRIDA_EXCLUDE_RANGES", + "AFL_FRIDA_INST_CACHE_SIZE", "AFL_FRIDA_INST_COVERAGE_FILE", "AFL_FRIDA_INST_DEBUG_FILE", "AFL_FRIDA_INST_INSN", "AFL_FRIDA_INST_JIT", + "AFL_FRIDA_INST_NO_CACHE", "AFL_FRIDA_INST_NO_OPTIMIZE", "AFL_FRIDA_INST_NO_PREFETCH", "AFL_FRIDA_INST_NO_PREFETCH_BACKPATCH", diff --git a/include/forkserver.h b/include/forkserver.h index fd4d283c..5b66e7ec 100644 --- a/include/forkserver.h +++ b/include/forkserver.h @@ -70,6 +70,8 @@ typedef struct { enum NyxReturnValue (*nyx_exec)(void *qemu_process); uint8_t *(*nyx_get_bitmap_buffer)(void *qemu_process); size_t (*nyx_get_bitmap_buffer_size)(void *qemu_process); + uint32_t (*nyx_get_aux_string)(void *nyx_process, uint8_t *buffer, + uint32_t size); } nyx_plugin_handler_t; @@ -173,6 +175,7 @@ typedef struct afl_forkserver { void * nyx_runner; /* nyx runner object */ u32 nyx_id; /* nyx runner id (0 -> master) */ u32 nyx_bind_cpu_id; /* nyx runner cpu id */ + char * nyx_aux_string; #endif } afl_forkserver_t; |