From 8521eb841364a06914b3ea7d8090b69d9de1dcd4 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 26 Dec 2021 01:15:53 +0100 Subject: debug ci --- test/test-basic.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/test-basic.sh') diff --git a/test/test-basic.sh b/test/test-basic.sh index c39faa74..393e47ea 100755 --- a/test/test-basic.sh +++ b/test/test-basic.sh @@ -48,6 +48,8 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc $ECHO "$GREEN[+] ${AFL_GCC} hardened mode succeeded and is working" } || { $ECHO "$RED[!] ${AFL_GCC} hardened mode is not hardened" + env | egrep 'AFL|PATH|LLVM' + AFL_DEBUG=1 AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c CODE=1 } rm -f test-compcov.harden -- cgit 1.4.1 From 649076600dc1db265de43c3bc2d7a3bcf0aa4b5c Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 26 Dec 2021 01:24:03 +0100 Subject: debug ci --- test/test-basic.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'test/test-basic.sh') diff --git a/test/test-basic.sh b/test/test-basic.sh index 393e47ea..c87239d9 100755 --- a/test/test-basic.sh +++ b/test/test-basic.sh @@ -50,6 +50,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc $ECHO "$RED[!] ${AFL_GCC} hardened mode is not hardened" env | egrep 'AFL|PATH|LLVM' AFL_DEBUG=1 AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c + grep -Eqa 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden && echo found CODE=1 } rm -f test-compcov.harden -- cgit 1.4.1 From 146eb32c3116cac81870b99750306a6df5e8061c Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 26 Dec 2021 01:49:31 +0100 Subject: make tests working on macos --- test/test-basic.sh | 2 +- test/test-gcc-plugin.sh | 2 +- test/test-llvm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/test-basic.sh') diff --git a/test/test-basic.sh b/test/test-basic.sh index c87239d9..ef6c9bb5 100755 --- a/test/test-basic.sh +++ b/test/test-basic.sh @@ -162,7 +162,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc CODE=1 } test -e test-compcov.harden && { - grep -Eq$GREPAOPTION 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden > /dev/null 2>&1 && { + nm test-compcov.harden | grep -Eq 'stack_chk_fail|fstack-protector-all|fortified' > /dev/null 2>&1 && { $ECHO "$GREEN[+] ${AFL_GCC} hardened mode succeeded and is working" } || { $ECHO "$RED[!] ${AFL_GCC} hardened mode is not hardened" diff --git a/test/test-gcc-plugin.sh b/test/test-gcc-plugin.sh index 50d83e40..95ae9c47 100755 --- a/test/test-gcc-plugin.sh +++ b/test/test-gcc-plugin.sh @@ -40,7 +40,7 @@ test -e ../afl-gcc-fast -a -e ../afl-compiler-rt.o && { } test -e test-compcov.harden.gccpi && test_compcov_binary_functionality ./test-compcov.harden.gccpi && { - grep -Eq$GREPAOPTION 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden.gccpi > /dev/null 2>&1 && { + nm test-compcov.harden.gccpi | grep -Eq 'stack_chk_fail|fstack-protector-all|fortified' > /dev/null 2>&1 && { $ECHO "$GREEN[+] gcc_plugin hardened mode succeeded and is working" } || { $ECHO "$RED[!] gcc_plugin hardened mode is not hardened" diff --git a/test/test-llvm.sh b/test/test-llvm.sh index cb1849b1..ddbee378 100755 --- a/test/test-llvm.sh +++ b/test/test-llvm.sh @@ -110,7 +110,7 @@ test -e ../afl-clang-fast -a -e ../split-switches-pass.so && { CODE=1 } test -e test-compcov.harden && test_compcov_binary_functionality ./test-compcov.harden && { - grep -Eq$GREPAOPTION 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden > /dev/null 2>&1 && { + nm test-compcov.harden | grep -Eq 'stack_chk_fail|fstack-protector-all|fortified' > /dev/null 2>&1 && { $ECHO "$GREEN[+] llvm_mode hardened mode succeeded and is working" } || { $ECHO "$RED[!] llvm_mode hardened mode is not hardened" -- cgit 1.4.1 From 2d9e0f56b05e05ef7a485ccca95753a686535fb6 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 26 Dec 2021 01:54:19 +0100 Subject: debug ci --- test/test-basic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test-basic.sh') diff --git a/test/test-basic.sh b/test/test-basic.sh index ef6c9bb5..2c8ea122 100755 --- a/test/test-basic.sh +++ b/test/test-basic.sh @@ -50,7 +50,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc $ECHO "$RED[!] ${AFL_GCC} hardened mode is not hardened" env | egrep 'AFL|PATH|LLVM' AFL_DEBUG=1 AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c - grep -Eqa 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden && echo found + nm test-compcov.harden CODE=1 } rm -f test-compcov.harden -- cgit 1.4.1 From a91d445b5f89175ab3e7fd183a46c23011d2e1bc Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 26 Dec 2021 01:55:52 +0100 Subject: make tests working on macos --- test/test-basic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test-basic.sh') diff --git a/test/test-basic.sh b/test/test-basic.sh index 2c8ea122..bec42b4d 100755 --- a/test/test-basic.sh +++ b/test/test-basic.sh @@ -44,7 +44,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc CODE=1 } test -e test-compcov.harden && { - grep -Eq$GREPAOPTION 'stack_chk_fail|fstack-protector-all|fortified' test-compcov.harden > /dev/null 2>&1 && { + nm test-compcov.harden | grep -Eq 'stack_chk_fail|fstack-protector-all|fortified' > /dev/null 2>&1 && { $ECHO "$GREEN[+] ${AFL_GCC} hardened mode succeeded and is working" } || { $ECHO "$RED[!] ${AFL_GCC} hardened mode is not hardened" -- cgit 1.4.1