From f807d7cefbc3c0e71cac6aad5cc28006f6a253be Mon Sep 17 00:00:00 2001 From: van Hauser Date: Mon, 24 Feb 2020 02:45:17 +0100 Subject: important InsTrim fixes! --- include/envs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/envs.h b/include/envs.h index 4650dc54..8e6e3731 100644 --- a/include/envs.h +++ b/include/envs.h @@ -59,7 +59,7 @@ const char *afl_environment_variables[] = { "AFL_NO_CPU_RED", "AFL_NO_FORKSRV", "AFL_NO_UI", - "AFL_NO_X86", // not really an env but we dont want to warn on it + "AFL_NO_X86", // not really an env but we dont want to warn on it "AFL_PATH", "AFL_PERFORMANCE_FILE", "AFL_PERSISTENT", -- cgit 1.4.1 From 3f6bfbd98148f7decb5ca8a049d334d05c560c09 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Mon, 24 Feb 2020 17:24:06 +0100 Subject: v2.61c --- README.md | 4 ++-- docs/Changelog.md | 2 +- include/config.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/README.md b/README.md index b61cbfd0..4c305412 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ ![Travis State](https://api.travis-ci.com/vanhauser-thc/AFLplusplus.svg?branch=master) - Release Version: 2.60c + Release Version: 2.61c - Github Version: 2.60d + Github Version: 2.61d includes all necessary/interesting changes from Google's afl 2.56b diff --git a/docs/Changelog.md b/docs/Changelog.md index 0d67e807..5019a0a7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -9,7 +9,7 @@ Want to stay in the loop on major new features? Join our mailing list by sending a mail to . -### Version ++2.60d (develop): +### Version ++2.61c (release): - use -march=native if available - most tools now check for mistyped environment variables diff --git a/include/config.h b/include/config.h index 12e2d092..d1b40245 100644 --- a/include/config.h +++ b/include/config.h @@ -27,7 +27,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++2.60d" +#define VERSION "++2.61c" /****************************************************** * * -- cgit 1.4.1 From 9cc8ebd35123ee67ae0533f2cf03d725d402868b Mon Sep 17 00:00:00 2001 From: van Hauser Date: Mon, 24 Feb 2020 17:26:02 +0100 Subject: 2.61d init --- docs/Changelog.md | 5 +++++ include/config.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/docs/Changelog.md b/docs/Changelog.md index 5019a0a7..4e99bcac 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -9,6 +9,11 @@ Want to stay in the loop on major new features? Join our mailing list by sending a mail to . +### Version ++2.61d (develop): + + - ... + + ### Version ++2.61c (release): - use -march=native if available diff --git a/include/config.h b/include/config.h index d1b40245..59a476c9 100644 --- a/include/config.h +++ b/include/config.h @@ -27,7 +27,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++2.61c" +#define VERSION "++2.61d" /****************************************************** * * -- cgit 1.4.1 From 901360b902b57d538eebaa38b7d20fe0eb639c33 Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Mon, 24 Feb 2020 23:19:56 +0100 Subject: sync afl-as setup with afl-llvm-rt (add __afl_area_ptr[0] = 1) --- include/afl-as.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/afl-as.h b/include/afl-as.h index bd5e734a..de9fb646 100644 --- a/include/afl-as.h +++ b/include/afl-as.h @@ -261,6 +261,7 @@ static const u8* main_payload_32 = " je __afl_setup_abort\n" "\n" #endif + " movb $1, (%eax)\n" " /* Store the address of the SHM region. */\n" "\n" " movl %eax, __afl_area_ptr\n" @@ -563,6 +564,7 @@ static const u8* main_payload_64 = " je __afl_setup_abort\n" "\n" #endif + " movb $1, (%rax)\n" " /* Store the address of the SHM region. */\n" "\n" " movq %rax, %rdx\n" -- cgit 1.4.1