From e90fa623d9c88be109de9cfd69d6939283cd105b Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 30 Dec 2019 17:23:23 +0000 Subject: libtokencap adding timingsafe* string comparators --- libtokencap/libtokencap.so.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libtokencap') diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c index 647b85bc..04825e02 100644 --- a/libtokencap/libtokencap.so.c +++ b/libtokencap/libtokencap.so.c @@ -687,6 +687,20 @@ bool strcsequal(const void* s1, const void* s2) { } +/* bcmp/memcmp BSD flavors, similar to CRYPTO_memcmp */ + +int timingsafe_bcmp(const void* mem1, const void* mem2, size_t len) { + + return bcmp(mem1, mem2, len); + +} + +int timingsafe_memcmp(const void* mem1, const void* mem2, size_t len) { + + return memcmp(mem1, mem2, len); + +} + /* Init code to open the output file (or default to stderr). */ __attribute__((constructor)) void __tokencap_init(void) { -- cgit 1.4.1 From 3f2f232fc562ab1fa2b8fc0686afda83d29fa02a Mon Sep 17 00:00:00 2001 From: David Carlier Date: Wed, 1 Jan 2020 10:59:57 +0000 Subject: libtokencap, fix mac os process map lookup. Incrementing base address for next iteration. --- libtokencap/libtokencap.so.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libtokencap') diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c index 04825e02..5abed0f6 100644 --- a/libtokencap/libtokencap.so.c +++ b/libtokencap/libtokencap.so.c @@ -142,6 +142,9 @@ static void __tokencap_load_mappings(void) { } + base += size; + size = 0; + } } -- cgit 1.4.1 From 3827b912c7090314bb011fe6c1ccfaf0d33fc678 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Thu, 2 Jan 2020 08:39:29 +0100 Subject: compile fixes --- docs/ChangeLog | 5 +++-- libdislocator/Makefile | 4 ++-- libtokencap/Makefile | 4 ++-- llvm_mode/Makefile | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'libtokencap') diff --git a/docs/ChangeLog b/docs/ChangeLog index 745f2587..d3b27e35 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -17,8 +17,9 @@ sending a mail to . Version ++2.60d (develop): -------------------------- - - exciting new stuff is coming up :-) - - all the best for the new year! + - afl-fuzz: + - now prints the real python version support compiled in + - added fix from Debian project to compile libdislocator and libtokencap -------------------------- diff --git a/libdislocator/Makefile b/libdislocator/Makefile index dae187e5..279667a1 100644 --- a/libdislocator/Makefile +++ b/libdislocator/Makefile @@ -18,8 +18,8 @@ HELPER_PATH = $(PREFIX)/lib/afl VERSION = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2) -CFLAGS ?= -O3 -funroll-loops -I ../include/ -CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign +CFLAGS ?= -O3 -funroll-loops +CFLAGS += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign ifdef USEHUGEPAGE CFLAGS += -DUSEHUGEPAGE diff --git a/libtokencap/Makefile b/libtokencap/Makefile index 3ecbf471..804f03c2 100644 --- a/libtokencap/Makefile +++ b/libtokencap/Makefile @@ -18,8 +18,8 @@ HELPER_PATH = $(PREFIX)/lib/afl VERSION = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2) -CFLAGS ?= -O3 -funroll-loops -I ../include/ -CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign +CFLAGS ?= -O3 -funroll-loops +CFLAGS += -I ../include/ -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign ifeq "$(shell uname)" "Linux" TARGETS = libtokencap.so diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile index 0e3da147..5bb1aef2 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -261,5 +261,5 @@ vpath % .. ln -sf afl-clang-fast.8 ../afl-clang-fast++.8 clean: - rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 + rm -f *.o *.so *~ a.out core core.[1-9][0-9]* .test2 test-instr .test-instr0 .test-instr1 afl-llvm-pass.dwo rm -f $(PROGS) ../afl-clang-fast++ ../afl-clang-fast*.8 -- cgit 1.4.1