Browse Source

Fuzzing: initialize siphash key, don't init_logging twice.

Nick Mathewson 7 years ago
parent
commit
ca657074b9
2 changed files with 7 additions and 1 deletions
  1. 3 0
      .gitignore
  2. 4 1
      src/test/fuzz/fuzzing_common.c

+ 3 - 0
.gitignore

@@ -196,6 +196,9 @@ uptime-*.json
 /src/test/test-timers.exe
 /src/test/test-timers.exe
 /src/test/test_workqueue.exe
 /src/test/test_workqueue.exe
 
 
+# /src/test/fuzz
+/src/test/fuzz/fuzz-*
+
 # /src/tools/
 # /src/tools/
 /src/tools/tor-checkkey
 /src/tools/tor-checkkey
 /src/tools/tor-resolve
 /src/tools/tor-resolve

+ 4 - 1
src/test/fuzz/fuzzing_common.c

@@ -104,7 +104,10 @@ main(int argc, char **argv)
   size_t size;
   size_t size;
 
 
   tor_threads_init();
   tor_threads_init();
-  init_logging(1);
+  {
+    struct sipkey sipkey = { 1337, 7331 };
+    siphash_set_global_key(&sipkey);
+  }
 
 
   /* Disable logging by default to speed up fuzzing. */
   /* Disable logging by default to speed up fuzzing. */
   int loglevel = LOG_ERR;
   int loglevel = LOG_ERR;