From ca657074b9602940c3a45b9c4cfe69d5f078084c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Dec 2016 20:24:54 -0500
Subject: [PATCH] Fuzzing: initialize siphash key, don't init_logging twice.
---
.gitignore | 3 +++
src/test/fuzz/fuzzing_common.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index dc6738c079..1491b11b7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,6 +196,9 @@ uptime-*.json
/src/test/test-timers.exe
/src/test/test_workqueue.exe
+# /src/test/fuzz
+/src/test/fuzz/fuzz-*
+
# /src/tools/
/src/tools/tor-checkkey
/src/tools/tor-resolve
diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c
index e17bae3565..f2570a1a12 100644
--- a/src/test/fuzz/fuzzing_common.c
+++ b/src/test/fuzz/fuzzing_common.c
@@ -104,7 +104,10 @@ main(int argc, char **argv)
size_t size;
tor_threads_init();
- init_logging(1);
+ {
+ struct sipkey sipkey = { 1337, 7331 };
+ siphash_set_global_key(&sipkey);
+ }
/* Disable logging by default to speed up fuzzing. */
int loglevel = LOG_ERR;
--
GitLab