July 2021 - tor-commits - lists.torproject.org

[tor/main] test_hs_ob: initialize pointers to NULL
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit a11a9bb3a0ebdba5c4a283012cc35d5077ee796c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 12 14:59:29 2021 -0400 test_hs_ob: initialize pointers to NULL This is an attempt to fix CID 1486280, where coverity warns us that, if the tests failed, we might free() an uninitialized pointer. --- src/test/test_hs_ob.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_hs_ob.c b/src/test/test_hs_ob.c index 3485655c2e..2f69bf31e0 100644 --- a/src/test/test_hs_ob.c +++ b/src/test/test_hs_ob.c @@ -174,6 +174,7 @@ test_get_subcredentials(void *arg) hs_subcredential_t *subcreds = NULL; (void) arg; + memset(&config, 0, sizeof(config)); MOCK(networkstatus_get_live_consensus, mock_networkstatus_get_live_consensus);

1 0

[tor/main] Remove some needless includes
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit 27d6b3ae7a7e1464395de9ed7e89d430d52f9356 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 12 15:53:56 2021 -0400 Remove some needless includes --- src/test/fuzz/fuzz_address.c | 79 +++++++++-------------------------------- src/test/fuzz/fuzz_addressPTR.c | 75 +++++++++----------------------------- 2 files changed, 33 insertions(+), 121 deletions(-) diff --git a/src/test/fuzz/fuzz_address.c b/src/test/fuzz/fuzz_address.c index 332267fb13..6dccd65e9d 100644 --- a/src/test/fuzz/fuzz_address.c +++ b/src/test/fuzz/fuzz_address.c @@ -1,73 +1,26 @@ #include "lib/net/address.h" -#include "lib/net/socket.h" -#include "lib/cc/ctassert.h" -#include "lib/container/smartlist.h" -#include "lib/ctime/di_ops.h" -#include "lib/log/log.h" -#include "lib/log/escape.h" #include "lib/malloc/malloc.h" -#include "lib/net/inaddr.h" -#include "lib/string/compat_ctype.h" -#include "lib/string/compat_string.h" -#include "lib/string/parse_int.h" -#include "lib/string/printf.h" -#include "lib/string/util_string.h" - -#include "ext/siphash.h" - -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_ERRNO_H -#include <errno.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> /* FreeBSD needs this to know what version it is */ -#endif -#ifdef HAVE_SYS_UN_H -#include <sys/un.h> -#endif -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "test/fuzz/fuzzing.h" -int fuzz_init(void){ - return 0; +int +fuzz_init(void) +{ + return 0; } -int fuzz_cleanup(void){ - return 0; +int +fuzz_cleanup(void) +{ + return 0; } -int fuzz_main(const uint8_t *data, size_t sz){ - - tor_addr_t addr; - char *fuzzing_data = tor_memdup_nulterm(data, sz); - tor_addr_parse(&addr, fuzzing_data); - tor_free(fuzzing_data); - return 0; +int +fuzz_main(const uint8_t *data, size_t sz) +{ + tor_addr_t addr; + char *fuzzing_data = tor_memdup_nulterm(data, sz); + tor_addr_parse(&addr, fuzzing_data); + tor_free(fuzzing_data); + return 0; } diff --git a/src/test/fuzz/fuzz_addressPTR.c b/src/test/fuzz/fuzz_addressPTR.c index e60a7dc74b..b503d53666 100644 --- a/src/test/fuzz/fuzz_addressPTR.c +++ b/src/test/fuzz/fuzz_addressPTR.c @@ -6,68 +6,27 @@ #include "lib/log/log.h" #include "lib/log/escape.h" #include "lib/malloc/malloc.h" -#include "lib/net/inaddr.h" -#include "lib/string/compat_ctype.h" -#include "lib/string/compat_string.h" -#include "lib/string/parse_int.h" -#include "lib/string/printf.h" -#include "lib/string/util_string.h" - -#include "ext/siphash.h" - -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_ERRNO_H -#include <errno.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> /* FreeBSD needs this to know what version it is */ -#endif -#ifdef HAVE_SYS_UN_H -#include <sys/un.h> -#endif -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - +#include "lib/net/address.h" #include "test/fuzz/fuzzing.h" -int fuzz_init(void){ - return 0; +int +fuzz_init(void) +{ + return 0; } -int fuzz_cleanup(void){ - return 0; +int +fuzz_cleanup(void) +{ + return 0; } -int fuzz_main(const uint8_t *data, size_t sz){ - - tor_addr_t addr_result; - char *fuzzing_data = tor_memdup_nulterm(data, sz); - tor_addr_parse_PTR_name(&addr_result, fuzzing_data, AF_UNSPEC, 1); - tor_free(fuzzing_data); - return 0; +int +fuzz_main(const uint8_t *data, size_t sz) +{ + tor_addr_t addr_result; + char *fuzzing_data = tor_memdup_nulterm(data, sz); + tor_addr_parse_PTR_name(&addr_result, fuzzing_data, AF_UNSPEC, 1); + tor_free(fuzzing_data); + return 0; }

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/407'
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit 45bb6ae60b63c74f18a2b032c4299307e2301aae Merge: a11a9bb3a0 66c5bbb435 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 12 15:41:12 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/407' scripts/codegen/fuzzing_include_am.py | 3 ++ src/test/fuzz/fuzz_address.c | 73 +++++++++++++++++++++++++++++ src/test/fuzz/fuzz_addressPTR.c | 73 +++++++++++++++++++++++++++++ src/test/fuzz/fuzz_hexdigest.c | 72 +++++++++++++++++++++++++++++ src/test/fuzz/include.am | 87 +++++++++++++++++++++++++++++++++++ 5 files changed, 308 insertions(+)

1 0

[tor/main] Remove fuzz_hexdigest.c: It is already covered by other fuzzers
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit c63541a0b08dceb23c48cd9be1559b628f73b428 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 12 15:42:32 2021 -0400 Remove fuzz_hexdigest.c: It is already covered by other fuzzers --- scripts/codegen/fuzzing_include_am.py | 1 - src/test/fuzz/fuzz_hexdigest.c | 72 ----------------------------------- src/test/fuzz/include.am | 29 -------------- 3 files changed, 102 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index 4c0b01576e..95436a5a93 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -6,7 +6,6 @@ from __future__ import print_function from __future__ import unicode_literals FUZZERS = """ - hexdigest address addressPTR consensus diff --git a/src/test/fuzz/fuzz_hexdigest.c b/src/test/fuzz/fuzz_hexdigest.c deleted file mode 100644 index 376c77f35a..0000000000 --- a/src/test/fuzz/fuzz_hexdigest.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "core/or/or.h" - -#include "app/config/config.h" -#include "core/mainloop/connection.h" -#include "core/mainloop/mainloop.h" -#include "core/or/circuitlist.h" -#include "core/or/circuituse.h" -#include "core/or/extendinfo.h" -#include "core/or/policies.h" -#include "feature/client/bridges.h" -#include "feature/control/control_events.h" -#include "feature/dirauth/authmode.h" -#include "feature/dirauth/process_descs.h" -#include "feature/dirauth/reachability.h" -#include "feature/dircache/dirserv.h" -#include "feature/dirclient/dirclient.h" -#include "feature/dirclient/dirclient_modes.h" -#include "feature/dirclient/dlstatus.h" -#include "feature/dircommon/directory.h" -#include "feature/nodelist/authcert.h" -#include "feature/nodelist/describe.h" -#include "feature/nodelist/dirlist.h" -#include "feature/nodelist/microdesc.h" -#include "feature/nodelist/networkstatus.h" -#include "feature/nodelist/node_select.h" -#include "feature/nodelist/nodelist.h" -#include "feature/nodelist/routerinfo.h" -#include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" -#include "feature/nodelist/routerset.h" -#include "feature/nodelist/torcert.h" -#include "feature/relay/routermode.h" -#include "feature/relay/relay_find_addr.h" -#include "feature/stats/rephist.h" -#include "lib/crypt_ops/crypto_format.h" -#include "lib/crypt_ops/crypto_rand.h" - -#include "feature/dircommon/dir_connection_st.h" -#include "feature/dirclient/dir_server_st.h" -#include "feature/nodelist/document_signature_st.h" -#include "feature/nodelist/extrainfo_st.h" -#include "feature/nodelist/networkstatus_st.h" -#include "feature/nodelist/networkstatus_voter_info_st.h" -#include "feature/nodelist/node_st.h" -#include "feature/nodelist/routerinfo_st.h" -#include "feature/nodelist/routerlist_st.h" -#include "feature/nodelist/vote_routerstatus_st.h" - -#include "lib/crypt_ops/digestset.h" - -#include "test/fuzz/fuzzing.h" - - -int fuzz_init(void) -{ - return 0; -} - -int fuzz_cleanup(void) -{ - return 0; -} - -int fuzz_main(const uint8_t *data, size_t sz) -{ - char *fuzzing_data = tor_memdup_nulterm(data, sz); - char digest[20]; - - hexdigest_to_digest(fuzzing_data, digest); - tor_free(fuzzing_data); - return 0; -} diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index a6f6cbb58f..951eb04e6b 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -102,16 +102,6 @@ src_test_fuzz_fuzz_extrainfo_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_extrainfo_LDADD = $(FUZZING_LIBS) endif -if UNITTESTS_ENABLED -src_test_fuzz_fuzz_hexdigest_SOURCES = \ - src/test/fuzz/fuzzing_common.c \ - src/test/fuzz/fuzz_hexdigest.c -src_test_fuzz_fuzz_hexdigest_CPPFLAGS = $(FUZZING_CPPFLAGS) -src_test_fuzz_fuzz_hexdigest_CFLAGS = $(FUZZING_CFLAGS) -src_test_fuzz_fuzz_hexdigest_LDFLAGS = $(FUZZING_LDFLAG) -src_test_fuzz_fuzz_hexdigest_LDADD = $(FUZZING_LIBS) -endif - if UNITTESTS_ENABLED src_test_fuzz_fuzz_hsdescv3_SOURCES = \ src/test/fuzz/fuzzing_common.c \ @@ -191,7 +181,6 @@ FUZZERS = \ src/test/fuzz/fuzz-diff \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ - src/test/fuzz/fuzz-hexdigest \ src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-http-connect \ @@ -267,15 +256,6 @@ src_test_fuzz_lf_fuzz_extrainfo_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_extrainfo_LDADD = $(LIBFUZZER_LIBS) endif -if UNITTESTS_ENABLED -src_test_fuzz_lf_fuzz_hexdigest_SOURCES = \ - $(src_test_fuzz_fuzz_hexdigest_SOURCES) -src_test_fuzz_lf_fuzz_hexdigest_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) -src_test_fuzz_lf_fuzz_hexdigest_CFLAGS = $(LIBFUZZER_CFLAGS) -src_test_fuzz_lf_fuzz_hexdigest_LDFLAGS = $(LIBFUZZER_LDFLAG) -src_test_fuzz_lf_fuzz_hexdigest_LDADD = $(LIBFUZZER_LIBS) -endif - if UNITTESTS_ENABLED src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ $(src_test_fuzz_fuzz_hsdescv3_SOURCES) @@ -347,7 +327,6 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-diff \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ - src/test/fuzz/lf-fuzz-hexdigest \ src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-http-connect \ @@ -412,13 +391,6 @@ src_test_fuzz_liboss_fuzz_extrainfo_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_extrainfo_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) endif -if UNITTESTS_ENABLED -src_test_fuzz_liboss_fuzz_hexdigest_a_SOURCES = \ - $(src_test_fuzz_fuzz_hexdigest_SOURCES) -src_test_fuzz_liboss_fuzz_hexdigest_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) -src_test_fuzz_liboss_fuzz_hexdigest_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) -endif - if UNITTESTS_ENABLED src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ $(src_test_fuzz_fuzz_hsdescv3_SOURCES) @@ -476,7 +448,6 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-diff.a \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ - src/test/fuzz/liboss-fuzz-hexdigest.a \ src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-http-connect.a \

1 0

[tor/main] tor_addr_parse_PTR_name() isolated harness
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit ad3519c165bd0fb18917068a4adc37f24fd84d80 Author: pedbap <pedbap.g(a)gmail.com> Date: Tue Jun 29 19:15:24 2021 +0000 tor_addr_parse_PTR_name() isolated harness --- src/test/fuzz/fuzz_addressPTR.c | 71 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/test/fuzz/fuzz_addressPTR.c b/src/test/fuzz/fuzz_addressPTR.c new file mode 100644 index 0000000000..48894f1be8 --- /dev/null +++ b/src/test/fuzz/fuzz_addressPTR.c @@ -0,0 +1,71 @@ +#include "lib/net/address.h" +#include "lib/net/socket.h" +#include "lib/cc/ctassert.h" +#include "lib/container/smartlist.h" +#include "lib/ctime/di_ops.h" +#include "lib/log/log.h" +#include "lib/log/escape.h" +#include "lib/malloc/malloc.h" +#include "lib/net/inaddr.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/compat_string.h" +#include "lib/string/parse_int.h" +#include "lib/string/printf.h" +#include "lib/string/util_string.h" + +#include "ext/siphash.h" + +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_ERRNO_H +#include <errno.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> /* FreeBSD needs this to know what version it is */ +#endif +#ifdef HAVE_SYS_UN_H +#include <sys/un.h> +#endif +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +int fuzz_init(void){ + return 0; +} + +int fuzz_cleanup(void){ + return 0; +} + +int fuzz_main(const uint8_t *data, size_t sz){ + + tor_addr_t addr_result; + char *fuzzing_data = tor_memdup_nulterm(data, sz); + tor_addr_parse_PTR_name(&addr_result, fuzzing_data, AF_UNSPEC, 1); + tor_free(fuzzing_data); + return 0; +}

1 0

[tor/main] Update include.am
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit b31932dfcfe21f7d6378512b95092554a1383341 Author: pedbap <pedbap.g(a)gmail.com> Date: Thu Jul 1 13:16:10 2021 +0000 Update include.am --- src/test/fuzz/include.am | 96 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 21 deletions(-) diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index cea03c00b7..a6f6cbb58f 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -32,6 +32,26 @@ LIBOSS_FUZZ_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBOSS_FUZZ_CFLAGS = $(FUZZING_CFLAGS) # ===== AFL fuzzers +if UNITTESTS_ENABLED +src_test_fuzz_fuzz_address_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_address.c +src_test_fuzz_fuzz_address_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_address_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_address_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_address_LDADD = $(FUZZING_LIBS) +endif + +if UNITTESTS_ENABLED +src_test_fuzz_fuzz_addressPTR_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_addressPTR.c +src_test_fuzz_fuzz_addressPTR_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_addressPTR_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_addressPTR_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_addressPTR_LDADD = $(FUZZING_LIBS) +endif + if UNITTESTS_ENABLED src_test_fuzz_fuzz_consensus_SOURCES = \ src/test/fuzz/fuzzing_common.c \ @@ -82,6 +102,16 @@ src_test_fuzz_fuzz_extrainfo_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_extrainfo_LDADD = $(FUZZING_LIBS) endif +if UNITTESTS_ENABLED +src_test_fuzz_fuzz_hexdigest_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_hexdigest.c +src_test_fuzz_fuzz_hexdigest_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_hexdigest_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_hexdigest_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_hexdigest_LDADD = $(FUZZING_LIBS) +endif + if UNITTESTS_ENABLED src_test_fuzz_fuzz_hsdescv3_SOURCES = \ src/test/fuzz/fuzzing_common.c \ @@ -154,11 +184,14 @@ endif if UNITTESTS_ENABLED FUZZERS = \ + src/test/fuzz/fuzz-address \ + src/test/fuzz/fuzz-addressPTR \ src/test/fuzz/fuzz-consensus \ src/test/fuzz/fuzz-descriptor \ src/test/fuzz/fuzz-diff \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ + src/test/fuzz/fuzz-hexdigest \ src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-http-connect \ @@ -171,20 +204,9 @@ endif # ===== libfuzzer if LIBFUZZER_ENABLED -if UNITTESTS_ENABLED -src_test_fuzz_lf_fuzz_hexdigest_SOURCES = \ - src/test/fuzz/fuzzing_common.c \ - src/test/fuzz/fuzz_hexdigest.c -src_test_fuzz_lf_fuzz_hexdigest_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) -src_test_fuzz_lf_fuzz_hexdigest_CFLAGS = $(LIBFUZZER_CFLAGS) -src_test_fuzz_lf_fuzz_hexdigest_LDFLAGS = $(LIBFUZZER_LDFLAG) -src_test_fuzz_lf_fuzz_hexdigest_LDADD = $(LIBFUZZER_LIBS) -endif - if UNITTESTS_ENABLED src_test_fuzz_lf_fuzz_address_SOURCES = \ - src/test/fuzz/fuzzing_common.c \ - src/test/fuzz/fuzz_address.c + $(src_test_fuzz_fuzz_address_SOURCES) src_test_fuzz_lf_fuzz_address_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) src_test_fuzz_lf_fuzz_address_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_address_LDFLAGS = $(LIBFUZZER_LDFLAG) @@ -192,13 +214,12 @@ src_test_fuzz_lf_fuzz_address_LDADD = $(LIBFUZZER_LIBS) endif if UNITTESTS_ENABLED -src_test_fuzz_lf_fuzz_addrPTR_SOURCES = \ - src/test/fuzz/fuzzing_common.c \ - src/test/fuzz/fuzz_addrPTR.c -src_test_fuzz_lf_fuzz_addrPTR_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) -src_test_fuzz_lf_fuzz_addrPTR_CFLAGS = $(LIBFUZZER_CFLAGS) -src_test_fuzz_lf_fuzz_addrPTR_LDFLAGS = $(LIBFUZZER_LDFLAG) -src_test_fuzz_lf_fuzz_addrPTR_LDADD = $(LIBFUZZER_LIBS) +src_test_fuzz_lf_fuzz_addressPTR_SOURCES = \ + $(src_test_fuzz_fuzz_addressPTR_SOURCES) +src_test_fuzz_lf_fuzz_addressPTR_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_addressPTR_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_addressPTR_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_addressPTR_LDADD = $(LIBFUZZER_LIBS) endif if UNITTESTS_ENABLED @@ -246,6 +267,15 @@ src_test_fuzz_lf_fuzz_extrainfo_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_extrainfo_LDADD = $(LIBFUZZER_LIBS) endif +if UNITTESTS_ENABLED +src_test_fuzz_lf_fuzz_hexdigest_SOURCES = \ + $(src_test_fuzz_fuzz_hexdigest_SOURCES) +src_test_fuzz_lf_fuzz_hexdigest_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_hexdigest_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_hexdigest_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_hexdigest_LDADD = $(LIBFUZZER_LIBS) +endif + if UNITTESTS_ENABLED src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ $(src_test_fuzz_fuzz_hsdescv3_SOURCES) @@ -310,14 +340,14 @@ src_test_fuzz_lf_fuzz_vrs_LDADD = $(LIBFUZZER_LIBS) endif LIBFUZZER_FUZZERS = \ - src/test/fuzz/lf-fuzz-hexdigest \ src/test/fuzz/lf-fuzz-address \ - src/test/fuzz/lf-fuzz-addrPTR + src/test/fuzz/lf-fuzz-addressPTR \ src/test/fuzz/lf-fuzz-consensus \ src/test/fuzz/lf-fuzz-descriptor \ src/test/fuzz/lf-fuzz-diff \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ + src/test/fuzz/lf-fuzz-hexdigest \ src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-http-connect \ @@ -333,6 +363,20 @@ endif # ===== oss-fuzz if OSS_FUZZ_ENABLED +if UNITTESTS_ENABLED +src_test_fuzz_liboss_fuzz_address_a_SOURCES = \ + $(src_test_fuzz_fuzz_address_SOURCES) +src_test_fuzz_liboss_fuzz_address_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_address_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +endif + +if UNITTESTS_ENABLED +src_test_fuzz_liboss_fuzz_addressPTR_a_SOURCES = \ + $(src_test_fuzz_fuzz_addressPTR_SOURCES) +src_test_fuzz_liboss_fuzz_addressPTR_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_addressPTR_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +endif + if UNITTESTS_ENABLED src_test_fuzz_liboss_fuzz_consensus_a_SOURCES = \ $(src_test_fuzz_fuzz_consensus_SOURCES) @@ -368,6 +412,13 @@ src_test_fuzz_liboss_fuzz_extrainfo_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_extrainfo_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) endif +if UNITTESTS_ENABLED +src_test_fuzz_liboss_fuzz_hexdigest_a_SOURCES = \ + $(src_test_fuzz_fuzz_hexdigest_SOURCES) +src_test_fuzz_liboss_fuzz_hexdigest_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_hexdigest_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +endif + if UNITTESTS_ENABLED src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ $(src_test_fuzz_fuzz_hsdescv3_SOURCES) @@ -418,11 +469,14 @@ src_test_fuzz_liboss_fuzz_vrs_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) endif OSS_FUZZ_FUZZERS = \ + src/test/fuzz/liboss-fuzz-address.a \ + src/test/fuzz/liboss-fuzz-addressPTR.a \ src/test/fuzz/liboss-fuzz-consensus.a \ src/test/fuzz/liboss-fuzz-descriptor.a \ src/test/fuzz/liboss-fuzz-diff.a \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ + src/test/fuzz/liboss-fuzz-hexdigest.a \ src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-http-connect.a \

1 0

[tor/main] tor_addr_parse() fuzzing harness
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit 453ea20827d3628a203870cc885e7444e09b9f0d Author: pedbap <pedbap.g(a)gmail.com> Date: Tue Jun 29 19:13:38 2021 +0000 tor_addr_parse() fuzzing harness --- src/test/fuzz/fuzz_address.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/test/fuzz/fuzz_address.c b/src/test/fuzz/fuzz_address.c new file mode 100644 index 0000000000..bedbe09b48 --- /dev/null +++ b/src/test/fuzz/fuzz_address.c @@ -0,0 +1,71 @@ +#include "lib/net/address.h" +#include "lib/net/socket.h" +#include "lib/cc/ctassert.h" +#include "lib/container/smartlist.h" +#include "lib/ctime/di_ops.h" +#include "lib/log/log.h" +#include "lib/log/escape.h" +#include "lib/malloc/malloc.h" +#include "lib/net/inaddr.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/compat_string.h" +#include "lib/string/parse_int.h" +#include "lib/string/printf.h" +#include "lib/string/util_string.h" + +#include "ext/siphash.h" + +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_ERRNO_H +#include <errno.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> /* FreeBSD needs this to know what version it is */ +#endif +#ifdef HAVE_SYS_UN_H +#include <sys/un.h> +#endif +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +int fuzz_init(void){ + return 0; +} + +int fuzz_cleanup(void){ + return 0; +} + +int fuzz_main(const uint8_t *data, size_t sz){ + + tor_addr_t addr; + char *fuzzing_data = tor_memdup_nulterm(data, sz); + tor_addr_parse(&addr, fuzzing_data); + tor_free(fuzzing_data); + return 0; +}

1 0

[tor/main] Adding new fuzzing harnesses for Makefile
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit 72577918740edb16f693a86f42a6d43bba5f5b75 Author: pedbap <pedbap.g(a)gmail.com> Date: Tue Jun 29 19:31:08 2021 +0000 Adding new fuzzing harnesses for Makefile --- src/test/fuzz/include.am | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index de3ea5e74a..cea03c00b7 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -171,6 +171,36 @@ endif # ===== libfuzzer if LIBFUZZER_ENABLED +if UNITTESTS_ENABLED +src_test_fuzz_lf_fuzz_hexdigest_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_hexdigest.c +src_test_fuzz_lf_fuzz_hexdigest_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_hexdigest_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_hexdigest_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_hexdigest_LDADD = $(LIBFUZZER_LIBS) +endif + +if UNITTESTS_ENABLED +src_test_fuzz_lf_fuzz_address_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_address.c +src_test_fuzz_lf_fuzz_address_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_address_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_address_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_address_LDADD = $(LIBFUZZER_LIBS) +endif + +if UNITTESTS_ENABLED +src_test_fuzz_lf_fuzz_addrPTR_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_addrPTR.c +src_test_fuzz_lf_fuzz_addrPTR_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_addrPTR_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_addrPTR_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_addrPTR_LDADD = $(LIBFUZZER_LIBS) +endif + if UNITTESTS_ENABLED src_test_fuzz_lf_fuzz_consensus_SOURCES = \ $(src_test_fuzz_fuzz_consensus_SOURCES) @@ -280,6 +310,9 @@ src_test_fuzz_lf_fuzz_vrs_LDADD = $(LIBFUZZER_LIBS) endif LIBFUZZER_FUZZERS = \ + src/test/fuzz/lf-fuzz-hexdigest \ + src/test/fuzz/lf-fuzz-address \ + src/test/fuzz/lf-fuzz-addrPTR src/test/fuzz/lf-fuzz-consensus \ src/test/fuzz/lf-fuzz-descriptor \ src/test/fuzz/lf-fuzz-diff \

1 0

[tor/main] hexdigest_to_digest() isolated harness
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit a0d65d8275a7b7c4b744e9a3479c781c47ab3937 Author: pedbap <pedbap.g(a)gmail.com> Date: Tue Jun 29 19:11:45 2021 +0000 hexdigest_to_digest() isolated harness --- src/test/fuzz/fuzz_hexdigest.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/test/fuzz/fuzz_hexdigest.c b/src/test/fuzz/fuzz_hexdigest.c new file mode 100644 index 0000000000..e4fd0a8c76 --- /dev/null +++ b/src/test/fuzz/fuzz_hexdigest.c @@ -0,0 +1,69 @@ +#include "core/or/or.h" + +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/mainloop.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/extendinfo.h" +#include "core/or/policies.h" +#include "feature/client/bridges.h" +#include "feature/control/control_events.h" +#include "feature/dirauth/authmode.h" +#include "feature/dirauth/process_descs.h" +#include "feature/dirauth/reachability.h" +#include "feature/dircache/dirserv.h" +#include "feature/dirclient/dirclient.h" +#include "feature/dirclient/dirclient_modes.h" +#include "feature/dirclient/dlstatus.h" +#include "feature/dircommon/directory.h" +#include "feature/nodelist/authcert.h" +#include "feature/nodelist/describe.h" +#include "feature/nodelist/dirlist.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/node_select.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerinfo.h" +#include "feature/nodelist/routerlist.h" +#include "feature/dirparse/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/nodelist/torcert.h" +#include "feature/relay/routermode.h" +#include "feature/relay/relay_find_addr.h" +#include "feature/stats/rephist.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_rand.h" + +#include "feature/dircommon/dir_connection_st.h" +#include "feature/dirclient/dir_server_st.h" +#include "feature/nodelist/document_signature_st.h" +#include "feature/nodelist/extrainfo_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "feature/nodelist/networkstatus_voter_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" +#include "feature/nodelist/vote_routerstatus_st.h" + +#include "lib/crypt_ops/digestset.h" + +int fuzz_init(void) +{ + return 0; +} + +int fuzz_cleanup(void) +{ + return 0; +} + +int fuzz_main(const uint8_t *data, size_t sz) +{ + char *fuzzing_data = tor_memdup_nulterm(data, sz); + char digest[20]; + + hexdigest_to_digest(fuzzing_data, digest); + tor_free(fuzzing_data); + return 0; +}

1 0

[tor/main] Update fuzzing_include_am.py
by nickm＠torproject.org 12 Jul '21

12 Jul '21

commit 8c9416ce19f737ecade35f89be9440533aae918e Author: pedbap <pedbap.g(a)gmail.com> Date: Thu Jul 1 13:54:14 2021 +0000 Update fuzzing_include_am.py --- scripts/codegen/fuzzing_include_am.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index ddad8e6c3b..a049dbb51c 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -6,6 +6,9 @@ from __future__ import print_function from __future__ import unicode_literals FUZZERS = """ + hexdigest + address + addressPTR consensus descriptor diff

1 0