fix merge conflicts

This commit is contained in:
vanhauser-thc
2021-07-19 10:48:41 +02:00
116 changed files with 8029 additions and 2394 deletions

View File

@ -15,15 +15,15 @@ aflpp_driver.o: aflpp_driver.c
-$(LLVM_BINDIR)clang -I. -I../../include $(CFLAGS) -c aflpp_driver.c
libAFLDriver.a: aflpp_driver.o
ar ru libAFLDriver.a aflpp_driver.o
cp -vf libAFLDriver.a ../../
@ar rc libAFLDriver.a aflpp_driver.o
@cp -vf libAFLDriver.a ../../
debug:
$(LLVM_BINDIR)clang -Wno-deprecated -I../../include $(CFLAGS) -D_DEBUG=\"1\" -c -o afl-performance.o ../../src/afl-performance.c
$(LLVM_BINDIR)clang -I../../include -D_DEBUG=\"1\" -g -funroll-loops -c aflpp_driver.c
#$(LLVM_BINDIR)clang -S -emit-llvm -Wno-deprecated -I../../include $(CFLAGS) -D_DEBUG=\"1\" -c -o afl-performance.ll ../../src/afl-performance.c
#$(LLVM_BINDIR)clang -S -emit-llvm -I../../include -D_DEBUG=\"1\" -g -funroll-loops -c aflpp_driver.c
ar ru libAFLDriver.a afl-performance.o aflpp_driver.o
ar rc libAFLDriver.a afl-performance.o aflpp_driver.o
aflpp_qemu_driver.o: aflpp_qemu_driver.c
-$(LLVM_BINDIR)clang $(CFLAGS) -O0 -funroll-loops -c aflpp_qemu_driver.c

View File

@ -1,3 +1,4 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
@ -27,6 +28,9 @@ int main(int argc, char **argv) {
} else {
fprintf(stderr,
"Using shared-memory testcases. To read via stdin, set "
"AFL_QEMU_DRIVER_NO_HOOK=1.\n");
uint8_t dummy_input[1024000] = {0};
LLVMFuzzerTestOneInput(dummy_input, 1);

View File

@ -1,5 +1,9 @@
# qbdi-based binary-only instrumentation for afl-fuzz
NOTE: this code is outdated and first would need to be adapted to the current
afl++ versions first.
Try afl_frida or fpicker [https://github.com/ttdennis/fpicker/](https://github.com/ttdennis/fpicker/) first, maybe they suite your need.
## 1) Introduction
The code in ./qbdi_mode allows you to build a standalone feature that