about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorvanhauser-thc <vh@thc.org>2024-06-07 13:46:15 +0200
committervanhauser-thc <vh@thc.org>2024-06-07 13:46:15 +0200
commit74e264a20a3af709a3546f7a3823e9788feb45f3 (patch)
treedcda715cef309cf92b5c54f4f1f6f42523dad0a3 /src
parentf0937f96d49fdb23865e2025576ab5c0049ef5b5 (diff)
downloadafl++-74e264a20a3af709a3546f7a3823e9788feb45f3.tar.gz
move function
Diffstat (limited to 'src')
-rw-r--r--src/afl-common.c18
-rw-r--r--src/afl-performance.c18
2 files changed, 18 insertions, 18 deletions
diff --git a/src/afl-common.c b/src/afl-common.c
index 4250fb36..efdb5d60 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -51,8 +51,6 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#include "hash.h"
-
 u8  be_quiet = 0;
 u8 *doc_path = "";
 u8  last_intr = 0;
@@ -169,22 +167,6 @@ void set_sanitizer_defaults() {
 
 }
 
-u64 get_binary_hash(u8 *fn) {
-
-  int fd = open(fn, O_RDONLY);
-  if (fd < 0) { PFATAL("Unable to open '%s'", fn); }
-  struct stat st;
-  if (fstat(fd, &st) < 0) { PFATAL("Unable to fstat '%s'", fn); }
-  u32 f_len = st.st_size;
-  u8 *f_data = mmap(0, f_len, PROT_READ, MAP_PRIVATE, fd, 0);
-  if (f_data == MAP_FAILED) { PFATAL("Unable to mmap file '%s'", fn); }
-  close(fd);
-  u64 hash = hash64(f_data, f_len, 0);
-  if (munmap(f_data, f_len)) { PFATAL("unmap() failed"); }
-  return hash;
-
-}
-
 u32 check_binary_signatures(u8 *fn) {
 
   int ret = 0, fd = open(fn, O_RDONLY);
diff --git a/src/afl-performance.c b/src/afl-performance.c
index 6c6e3c8b..e8ece6b5 100644
--- a/src/afl-performance.c
+++ b/src/afl-performance.c
@@ -95,6 +95,24 @@ inline u64 hash64(u8 *key, u32 len, u64 seed) {
 
 }
 
+/* Hash a file */
+
+u64 get_binary_hash(u8 *fn) {
+
+  int fd = open(fn, O_RDONLY);
+  if (fd < 0) { PFATAL("Unable to open '%s'", fn); }
+  struct stat st;
+  if (fstat(fd, &st) < 0) { PFATAL("Unable to fstat '%s'", fn); }
+  u32 f_len = st.st_size;
+  u8 *f_data = mmap(0, f_len, PROT_READ, MAP_PRIVATE, fd, 0);
+  if (f_data == MAP_FAILED) { PFATAL("Unable to mmap file '%s'", fn); }
+  close(fd);
+  u64 hash = hash64(f_data, f_len, 0);
+  if (munmap(f_data, f_len)) { PFATAL("unmap() failed"); }
+  return hash;
+
+}
+
 // Public domain SHA1 implementation copied from:
 // https://github.com/x42/liboauth/blob/7001b8256cd654952ec2515b055d2c5b243be600/src/sha1.c