commit 301eff0e90a727005d364ebc2e9a7ffaecd0a3ef Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 14 17:11:26 2016 -0500

fuzzing: Add copyright notices and whitespace fixes --- Makefile.am | 1 + src/test/fuzz/fuzz_descriptor.c | 2 ++ src/test/fuzz/fuzz_extrainfo.c | 2 ++ src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_microdesc.c | 2 ++ src/test/fuzz/fuzzing.h | 3 +++ src/test/fuzz/fuzzing_common.c | 6 ++++-- 7 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am index 2e853d4..5204830 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,6 +190,7 @@ if USE_PERL $(top_srcdir)/src/common/*.[ch] \ $(top_srcdir)/src/or/*.[ch] \ $(top_srcdir)/src/test/*.[ch] \ + $(top_srcdir)/src/test/*/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] endif

diff --git a/src/test/fuzz/fuzz_descriptor.c b/src/test/fuzz/fuzz_descriptor.c index 563787b..d19386d 100644 --- a/src/test/fuzz/fuzz_descriptor.c +++ b/src/test/fuzz/fuzz_descriptor.c @@ -1,3 +1,5 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE #include "or.h" #include "routerparse.h" diff --git a/src/test/fuzz/fuzz_extrainfo.c b/src/test/fuzz/fuzz_extrainfo.c index 6bfc425..6251e60 100644 --- a/src/test/fuzz/fuzz_extrainfo.c +++ b/src/test/fuzz/fuzz_extrainfo.c @@ -1,3 +1,5 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE #include "or.h" #include "routerparse.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index 15d3726..f069900 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -37,7 +37,6 @@ mock_directory_handle_command_get(dir_connection_t *conn, if (headers) { log_debug(LD_GENERAL, "Header-Length:\n%zu\n", strlen(headers)); log_debug(LD_GENERAL, "Headers:\n%s\n", headers); - }

log_debug(LD_GENERAL, "Body-Length:\n%zu\n", body_len); @@ -130,3 +129,4 @@ fuzz_main(const uint8_t *stdin_buf, size_t data_size)

return 0; } + diff --git a/src/test/fuzz/fuzz_microdesc.c b/src/test/fuzz/fuzz_microdesc.c index bb94459..bb89546 100644 --- a/src/test/fuzz/fuzz_microdesc.c +++ b/src/test/fuzz/fuzz_microdesc.c @@ -1,3 +1,5 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ #define ROUTERPARSE_PRIVATE #include "or.h" #include "routerparse.h" diff --git a/src/test/fuzz/fuzzing.h b/src/test/fuzz/fuzzing.h index a8cbb1d..4295743 100644 --- a/src/test/fuzz/fuzzing.h +++ b/src/test/fuzz/fuzzing.h @@ -1,3 +1,5 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ #ifndef FUZZING_H #define FUZZING_H

@@ -8,3 +10,4 @@ int fuzz_main(const uint8_t *data, size_t sz); void disable_signature_checking(void);

#endif /* FUZZING_H */ + diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 54a7923..57c3cf5 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -1,3 +1,5 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ #define CRYPTO_ED25519_PRIVATE #include "orconfig.h" #include "or.h" @@ -78,7 +80,6 @@ mock_ed25519_impl_spot_check__nocheck(void) return 0; }

- void disable_signature_checking(void) { @@ -93,7 +94,8 @@ disable_signature_checking(void)

#ifdef LLVM_FUZZ int -LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { +LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) +{ static int initialized = 0; if (!initialized) { if (fuzz_init() < 0)