summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-13 20:24:54 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-30 08:37:23 -0500
commitca657074b9602940c3a45b9c4cfe69d5f078084c (patch)
treea83529d84fc4c1c0e99392cd0bf7f41fff9f7985
parent0666928c5c367506b0173118153bb804e46eca44 (diff)
downloadtor-ca657074b9602940c3a45b9c4cfe69d5f078084c.tar.gz
tor-ca657074b9602940c3a45b9c4cfe69d5f078084c.zip
Fuzzing: initialize siphash key, don't init_logging twice.
-rw-r--r--.gitignore3
-rw-r--r--src/test/fuzz/fuzzing_common.c5
2 files changed, 7 insertions, 1 deletions
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;