From 83487415b1ba3f11a6a03516b20923e6278cb97a Mon Sep 17 00:00:00 2001 From: llzmb <46303940+llzmb@users.noreply.github.com> Date: Mon, 13 Dec 2021 21:22:33 +0100 Subject: [PATCH] Fix images --- docs/resources/1_instrument_target.drawio.svg | 6 +----- docs/resources/2_prepare_campaign.drawio.svg | 6 +----- docs/resources/3_fuzz_target.drawio.svg | 6 +----- docs/resources/4_manage_campaign.drawio.svg | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/docs/resources/1_instrument_target.drawio.svg b/docs/resources/1_instrument_target.drawio.svg index 3b3502da..9e2d8734 100644 --- a/docs/resources/1_instrument_target.drawio.svg +++ b/docs/resources/1_instrument_target.drawio.svg @@ -1,8 +1,4 @@ -<<<<<<< HEAD -Instrument targetInstrument targetRequired taskRequired taskOptional taskOptional taskSelect compilerLTO mode(clang/clang++ 11+)LLVM mode(clang/clang++ 3.8+)GCC_PLUGIN mode(gcc 5+)GCC/CLANG mode(other)Select compiler...Select optionsSelect options depending onthe compiler:COMPCOV(only LTO)CmpLog(only LTO)selective instrumentation(LTO, LLVM, GCC_PLUGIN)Select options...Select sanitizerSelect one sanitizerper instance:ASANCFISANLSANMSANTSANUBSANSelect sanitizer...Compile target source codeCompile target source code depending on the build system:configureCMakeMeson Build SystemotherCompile target source code...Modify targetAll AFL++ compilersdo this automatically.Modify target...Viewer does not support full SVG 1.1 -======= -Instrument targetInstrument targetRequired taskRequired taskOptional taskOptional taskSelect compilerLTO mode(clang/clang++ 11+)LLVM mode(clang/clang++ 3.8+)GCC_PLUGIN mode(gcc 5+)GCC/CLANG mode(other)Select compiler...Select optionsSelect options depending onthe compiler:COMPCOV(only LTO)CmpLog(only LTO)selective instrumentation(LTO, LLVM, GCC_PLUGIN)Select options...Select sanitizerSelect one sanitizerper instance:ASANCFISANLSANMSANTSANUBSANSelect sanitizer...Compile target source codeCompile target source code depending on the build system:configureCMakeMeson Build SystemotherCompile target source code...Modify targetAll AFL++ compilersdo this automatically.Modify target...Viewer does not support full SVG 1.1 ->>>>>>> aceb1af908cd0d2b0b03cd23b917e59a18e7b0eb +Instrument targetInstrument targetRequired taskRequired taskOptional taskOptional taskSelect compilerLTO mode(clang/clang++ 11+)LLVM mode(clang/clang++ 3.8+)GCC_PLUGIN mode(gcc 5+)GCC/CLANG mode(other)Select compiler...Select optionsSelect options depending onthe compiler:COMPCOV(only LTO)CmpLog(only LTO)selective instrumentation(LTO, LLVM, GCC_PLUGIN)Select options...Select sanitizerSelect one sanitizerper instance:ASANCFISANLSANMSANTSANUBSANSelect sanitizer...Compile target source codeCompile target source code depending on the build system:configureCMakeMeson Build SystemotherCompile target source code...Modify targetAll AFL++ compilersdo this automatically.Modify target...Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/docs/resources/2_prepare_campaign.drawio.svg b/docs/resources/2_prepare_campaign.drawio.svg index 5f2ef991..92cc61c0 100644 --- a/docs/resources/2_prepare_campaign.drawio.svg +++ b/docs/resources/2_prepare_campaign.drawio.svg @@ -1,8 +1,4 @@ -<<<<<<< HEAD -Prepare campaignPrepare campaignRequired taskRequired taskOptional taskOptional taskMake input corpus uniqueUse afl-cmin on input corpus.Make input corpus unique...Minimize corpus fileUse afl-tmin on input files.Minimize corpus file...Collect inputsCollect one or more input files.Collect inputs...Viewer does not support full SVG 1.1 -======= -Prepare campaignPrepare campaignRequired taskRequired taskOptional taskOptional taskMake input corpus uniqueUse afl-cmin on input corpus.Make input corpus unique...Minimize corpus fileUse afl-tmin on input files.Minimize corpus file...Collect inputsCollect one or more input files.Collect inputs...Viewer does not support full SVG 1.1 ->>>>>>> aceb1af908cd0d2b0b03cd23b917e59a18e7b0eb +Prepare campaignPrepare campaignRequired taskRequired taskOptional taskOptional taskMake input corpus uniqueUse afl-cmin on input corpus.Make input corpus unique...Minimize corpus fileUse afl-tmin on input files.Minimize corpus file...Collect inputsCollect one or more input files.Collect inputs...Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/docs/resources/3_fuzz_target.drawio.svg b/docs/resources/3_fuzz_target.drawio.svg index 9147b6e7..a4e5c940 100644 --- a/docs/resources/3_fuzz_target.drawio.svg +++ b/docs/resources/3_fuzz_target.drawio.svg @@ -1,8 +1,4 @@ -<<<<<<< HEAD -Fuzz targetFuzz targetRequired taskRequired taskOptional taskOptional taskUse multiple coresFuzz one target withmultiple instances:One main fuzzer:-M mainSecondary fuzzers:-S variant1Use up to 32/64 coreson each machine.Cache test cases.Use multiple cores...Use multiple machinesFuzz one target withmultiple machines:One main fuzzer per server:-M mainSecondary fuzzers:-S variant1Sync between the servers.Use multiple machines...Run afl-fuzzReconfigure thesystem for optimal speed.Specify the input corpus directory.Add a dictionary.Set a memory limit.Run afl-fuzz...Viewer does not support full SVG 1.1 -======= -Fuzz targetFuzz targetRequired taskRequired taskOptional taskOptional taskUse multiple coresFuzz one target withmultiple instances:One main fuzzer:-M mainSecondary fuzzers:-S variant1Use up to 32/64 coreson each machine.Cache test cases.Use multiple cores...Use multiple machinesFuzz one target withmultiple machines:One main fuzzer per server:-M mainSecondary fuzzers:-S variant1Sync between the servers.Use multiple machines...Run afl-fuzzReconfigure thesystem for optimal speed.Specify the input corpus directory.Add a dictionary.Set a memory limit.Run afl-fuzz...Viewer does not support full SVG 1.1 ->>>>>>> aceb1af908cd0d2b0b03cd23b917e59a18e7b0eb +Fuzz targetFuzz targetRequired taskRequired taskOptional taskOptional taskUse multiple coresFuzz one target withmultiple instances:One main fuzzer:-M mainSecondary fuzzers:-S variant1Use up to 32/64 coreson each machine.Cache test cases.Use multiple cores...Use multiple machinesFuzz one target withmultiple machines:One main fuzzer per server:-M mainSecondary fuzzers:-S variant1Sync between the servers.Use multiple machines...Run afl-fuzzReconfigure thesystem for optimal speed.Specify the input corpus directory.Add a dictionary.Set a memory limit.Run afl-fuzz...Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/docs/resources/4_manage_campaign.drawio.svg b/docs/resources/4_manage_campaign.drawio.svg index d066cd21..dae9fbf9 100644 --- a/docs/resources/4_manage_campaign.drawio.svg +++ b/docs/resources/4_manage_campaign.drawio.svg @@ -1,8 +1,4 @@ -<<<<<<< HEAD -Check coverageUse afl-showmap to getcode coverage statistics.Use afl-cov to generate an HTML report on coverage.Check coverage...Manage campaignManage campaignRequired taskRequired taskOptional taskOptional taskMonitor statusUse afl-whatsup to show the status of the fuzzing campaign.Use afl-plot to generate an HTML report with graphs.Monitor status...Triage crashesUse afl-fuzz with -C flag to run crash exploration mode.Use afl-tmin on test casesfor minimization.Use afl-analyze to findcritical sections in test cases.Triage crashes...Start new campaign Stop instances withoutcrashes.Start new instances withdifferent options.Select new test casesbased on insights.Start new campaign...Viewer does not support full SVG 1.1 -======= -Check coverageUse afl-showmap to getcode coverage statistics.Use afl-cov to generate an HTML report on coverage.Check coverage...Manage campaignManage campaignRequired taskRequired taskOptional taskOptional taskMonitor statusUse afl-whatsup to show the status of the fuzzing campaign.Use afl-plot to generate an HTML report with graphs.Monitor status...Triage crashesUse afl-fuzz with -C flag to run crash exploration mode.Use afl-tmin on test casesfor minimization.Use afl-analyze to findcritical sections in test cases.Triage crashes...Start new campaign Stop instances withoutcrashes.Start new instances withdifferent options.Select new test casesbased on insights.Start new campaign...Viewer does not support full SVG 1.1 ->>>>>>> aceb1af908cd0d2b0b03cd23b917e59a18e7b0eb +Check coverageUse afl-showmap to getcode coverage statistics.Use afl-cov to generate an HTML report on coverage.Check coverage...Manage campaignManage campaignRequired taskRequired taskOptional taskOptional taskMonitor statusUse afl-whatsup to show the status of the fuzzing campaign.Use afl-plot to generate an HTML report with graphs.Monitor status...Triage crashesUse afl-fuzz with -C flag to run crash exploration mode.Use afl-tmin on test casesfor minimization.Use afl-analyze to findcritical sections in test cases.Triage crashes...Start new campaign Stop instances withoutcrashes.Start new instances withdifferent options.Select new test casesbased on insights.Start new campaign...Viewer does not support full SVG 1.1 \ No newline at end of file