From 48b2028af84f34dc825613aa56c098c6479c404a Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Thu, 28 May 2020 12:22:28 +0200
Subject: remove actions, we do this via docker hub

---
 action.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 action.yml

diff --git a/action.yml b/action.yml
deleted file mode 100644
index 64610282..00000000
--- a/action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- name: Login to docker hub
-  uses: actions-hub/docker/login@master
-  env:
-    DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-    DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-
-- name: Build :latest
-  run: docker build -t aflplusplus:latest .
-
-- name: Push to docker hub :latest
-  uses: actions-hub/docker@master
-  with:
-    args: push aflplusplus:latest
-- 
cgit 1.4.1


From bfd2b6298ea9309a14af5017e74e6f66c7ba49bc Mon Sep 17 00:00:00 2001
From: hexcoder- <heiko@hexco.de>
Date: Thu, 28 May 2020 22:23:30 +0200
Subject: OpenBSD6.7, 32bit fix add linker option -z notext

---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 7d9e6d83..44068b19 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -91,7 +91,7 @@ override CFLAGS += -Wall -g -Wno-pointer-sign -Wmissing-declarations\
 
 ifeq "$(shell uname -s)" "OpenBSD"
   override CFLAGS  += -I /usr/local/include/
-  LDFLAGS += -L /usr/local/lib/
+  LDFLAGS += -Wl,-z,notext -L /usr/local/lib/
 endif
 
 ifeq "$(shell uname -s)" "NetBSD"
-- 
cgit 1.4.1


From bb0a31158ae84a7f9ae287c7ce5837c66ae83990 Mon Sep 17 00:00:00 2001
From: hexcoder- <heiko@hexco.de>
Date: Thu, 28 May 2020 22:24:06 +0200
Subject: test.sh OpenBSD6.7, 32bit: add 'i386' to known intel strings

---
 test/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.sh b/test/test.sh
index 2559f058..c52be154 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -100,7 +100,7 @@ $ECHO "${RESET}${GREY}[*] starting afl++ test framework ..."
 test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed"
 
 $ECHO "$BLUE[*] Testing: ${AFL_GCC}, afl-showmap, afl-fuzz, afl-cmin and afl-tmin"
-test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" && {
+test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" -o "$SYS" = "i386" && {
  test -e ../${AFL_GCC} -a -e ../afl-showmap -a -e ../afl-fuzz && {
   ../${AFL_GCC} -o test-instr.plain ../test-instr.c > /dev/null 2>&1
   AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c > /dev/null 2>&1
-- 
cgit 1.4.1


From 4b01d594c40b4e59414413152392963f3cf5247d Mon Sep 17 00:00:00 2001
From: David Melski <melski@grammatech.com>
Date: Thu, 28 May 2020 20:25:30 -0400
Subject: Fix read_timed when accumulating short reads

The existing code appears to use 'len_read' in several places where
'total_read' was intended.  The function may work if the first 1 or 2
iterations of the loop read the requested 'len' bytes.

If the first two reads are "short" and a third read is done, the bytes
will be placed over previously read bytes in buf and more than 'len'
bytes may be read in total, though buf is never overrun.

This commit changes read_timed to

  (1) correctly append short reads in buf
  (2) correctly terminate when the sum of the short reads
      equals the requested 'len' bytes
  (3) return an error when read() returns -1 or 0

The function also depends on select() decrementing the timeout
structure, as it does on Linux.  On other platforms, the exec_ms
returned is likely incorrect.  This patch does not attempt to address
this issue.
---
 src/afl-common.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/afl-common.c b/src/afl-common.c
index 808c9812..22342065 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -885,9 +885,9 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
   timeout.tv_usec = (timeout_ms % 1000) * 1000;
 
   size_t read_total = 0;
-  size_t len_read = 0;
+  ssize_t len_read = 0;
 
-  while (len_read < len) {
+  while (read_total < len) {
 
     /* set exceptfds as well to return when a child exited/closed the pipe. */
     int sret = select(fd + 1, &readfds, NULL, NULL, &timeout);
@@ -905,8 +905,8 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
 
     }
 
-    len_read = read(fd, ((u8 *)buf) + len_read, len - len_read);
-    if (!len_read) { return 0; }
+    len_read = read(fd, ((u8 *)buf) + read_total, len - read_total);
+    if (len_read <= 0) { return 0; }
     read_total += len_read;
 
   }
-- 
cgit 1.4.1