Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus

1 files changed, 17 insertions, 0 deletions

diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c
index d67e4e16..e4f531c8 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;
+
     }
 
   }
@@ -687,6 +690,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) {