diff --git a/Makefile b/Makefile index acc8ec1..c58e5b7 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ fuzz-prepare-typ: fuzz-prepare-setters: go-fuzz-build -func FuzzSetters -o stun-setters-fuzz.zip github.com/gortc/stun fuzz-msg: - go-fuzz -bin=./stun-msg-fuzz.zip -workdir=examples/stun-msg + go-fuzz -bin=./stun-msg-fuzz.zip -workdir=fuzz/stun-msg fuzz-typ: - go-fuzz -bin=./stun-typ-fuzz.zip -workdir=examples/stun-typ + go-fuzz -bin=./stun-typ-fuzz.zip -workdir=fuzz/stun-typ fuzz-setters: - go-fuzz -bin=./stun-setters-fuzz.zip -workdir=examples/stun-setters + go-fuzz -bin=./stun-setters-fuzz.zip -workdir=fuzz/stun-setters fuzz-test: go test -tags gofuzz -run TestFuzz -v . fuzz-reset-setters: - rm -f -v -r stun-setters-fuzz.zip examples/stun-setters + rm -f -v -r stun-setters-fuzz.zip fuzz/stun-setters lint: @echo "linting on $(PROCS) cores" @gometalinter \ diff --git a/examples/README.md b/examples/README.md deleted file mode 100644 index 3302c94..0000000 --- a/examples/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Fuzzer corpus - -examples directory contains corpus for fuzzer. \ No newline at end of file diff --git a/fuzz/README.md b/fuzz/README.md new file mode 100644 index 0000000..5016501 --- /dev/null +++ b/fuzz/README.md @@ -0,0 +1,3 @@ +# Fuzzer corpus + +fuzz directory contains corpus for fuzzer. diff --git a/examples/stun-msg/corpus/07d9d07df5b341d90ce313f890431fe22673e88e-2 b/fuzz/stun-msg/corpus/07d9d07df5b341d90ce313f890431fe22673e88e-2 similarity index 100% rename from examples/stun-msg/corpus/07d9d07df5b341d90ce313f890431fe22673e88e-2 rename to fuzz/stun-msg/corpus/07d9d07df5b341d90ce313f890431fe22673e88e-2 diff --git a/examples/stun-msg/corpus/0f06d0415ec78e5a0670024180429a0d6622e90c-4 b/fuzz/stun-msg/corpus/0f06d0415ec78e5a0670024180429a0d6622e90c-4 similarity index 100% rename from examples/stun-msg/corpus/0f06d0415ec78e5a0670024180429a0d6622e90c-4 rename to fuzz/stun-msg/corpus/0f06d0415ec78e5a0670024180429a0d6622e90c-4 diff --git a/examples/stun-msg/corpus/25f2f9fdee7f38b2ce075a03be4c487da027e0c9-1 b/fuzz/stun-msg/corpus/25f2f9fdee7f38b2ce075a03be4c487da027e0c9-1 similarity index 100% rename from examples/stun-msg/corpus/25f2f9fdee7f38b2ce075a03be4c487da027e0c9-1 rename to fuzz/stun-msg/corpus/25f2f9fdee7f38b2ce075a03be4c487da027e0c9-1 diff --git a/examples/stun-msg/corpus/323cc3d2eb5115119562afa212f6c124fb4c2f43-6 b/fuzz/stun-msg/corpus/323cc3d2eb5115119562afa212f6c124fb4c2f43-6 similarity index 100% rename from examples/stun-msg/corpus/323cc3d2eb5115119562afa212f6c124fb4c2f43-6 rename to fuzz/stun-msg/corpus/323cc3d2eb5115119562afa212f6c124fb4c2f43-6 diff --git a/examples/stun-msg/corpus/325742b8349899bd75473819334034de786d8173-3 b/fuzz/stun-msg/corpus/325742b8349899bd75473819334034de786d8173-3 similarity index 100% rename from examples/stun-msg/corpus/325742b8349899bd75473819334034de786d8173-3 rename to fuzz/stun-msg/corpus/325742b8349899bd75473819334034de786d8173-3 diff --git a/examples/stun-msg/corpus/387d69f1e8239e36d3298b9e6459fcfe28aa60fe-3 b/fuzz/stun-msg/corpus/387d69f1e8239e36d3298b9e6459fcfe28aa60fe-3 similarity index 100% rename from examples/stun-msg/corpus/387d69f1e8239e36d3298b9e6459fcfe28aa60fe-3 rename to fuzz/stun-msg/corpus/387d69f1e8239e36d3298b9e6459fcfe28aa60fe-3 diff --git a/examples/stun-msg/corpus/45921a3525e058441c0ffd7be81d6b2ac8fc72c7-4 b/fuzz/stun-msg/corpus/45921a3525e058441c0ffd7be81d6b2ac8fc72c7-4 similarity index 100% rename from examples/stun-msg/corpus/45921a3525e058441c0ffd7be81d6b2ac8fc72c7-4 rename to fuzz/stun-msg/corpus/45921a3525e058441c0ffd7be81d6b2ac8fc72c7-4 diff --git a/examples/stun-msg/corpus/85745364c54dd7e3a7fe0019b98ce8af454ae963-7 b/fuzz/stun-msg/corpus/85745364c54dd7e3a7fe0019b98ce8af454ae963-7 similarity index 100% rename from examples/stun-msg/corpus/85745364c54dd7e3a7fe0019b98ce8af454ae963-7 rename to fuzz/stun-msg/corpus/85745364c54dd7e3a7fe0019b98ce8af454ae963-7 diff --git a/examples/stun-msg/corpus/895d16bc50ce45b6b3684175b57216876084bd81-8 b/fuzz/stun-msg/corpus/895d16bc50ce45b6b3684175b57216876084bd81-8 similarity index 100% rename from examples/stun-msg/corpus/895d16bc50ce45b6b3684175b57216876084bd81-8 rename to fuzz/stun-msg/corpus/895d16bc50ce45b6b3684175b57216876084bd81-8 diff --git a/examples/stun-msg/corpus/a26e2093b2d3212cd9ff57dbb8d4f62972077971-9 b/fuzz/stun-msg/corpus/a26e2093b2d3212cd9ff57dbb8d4f62972077971-9 similarity index 100% rename from examples/stun-msg/corpus/a26e2093b2d3212cd9ff57dbb8d4f62972077971-9 rename to fuzz/stun-msg/corpus/a26e2093b2d3212cd9ff57dbb8d4f62972077971-9 diff --git a/examples/stun-msg/corpus/a456f433f4c433a00b723e645759877bbccdd969-4 b/fuzz/stun-msg/corpus/a456f433f4c433a00b723e645759877bbccdd969-4 similarity index 100% rename from examples/stun-msg/corpus/a456f433f4c433a00b723e645759877bbccdd969-4 rename to fuzz/stun-msg/corpus/a456f433f4c433a00b723e645759877bbccdd969-4 diff --git a/examples/stun-msg/corpus/a788ca1e84797136fec6e61f8bf1206622aec141-1 b/fuzz/stun-msg/corpus/a788ca1e84797136fec6e61f8bf1206622aec141-1 similarity index 100% rename from examples/stun-msg/corpus/a788ca1e84797136fec6e61f8bf1206622aec141-1 rename to fuzz/stun-msg/corpus/a788ca1e84797136fec6e61f8bf1206622aec141-1 diff --git a/examples/stun-msg/corpus/ac92f2f215a192e18307fb229c3e31d1d36ea72b-9 b/fuzz/stun-msg/corpus/ac92f2f215a192e18307fb229c3e31d1d36ea72b-9 similarity index 100% rename from examples/stun-msg/corpus/ac92f2f215a192e18307fb229c3e31d1d36ea72b-9 rename to fuzz/stun-msg/corpus/ac92f2f215a192e18307fb229c3e31d1d36ea72b-9 diff --git a/examples/stun-msg/corpus/b1ad18e20a8d34c86cec4db711408a71b16ed27d-5 b/fuzz/stun-msg/corpus/b1ad18e20a8d34c86cec4db711408a71b16ed27d-5 similarity index 100% rename from examples/stun-msg/corpus/b1ad18e20a8d34c86cec4db711408a71b16ed27d-5 rename to fuzz/stun-msg/corpus/b1ad18e20a8d34c86cec4db711408a71b16ed27d-5 diff --git a/examples/stun-msg/corpus/bdc18abc9f9705cc46de5537fbf88bc16af9ea26-2 b/fuzz/stun-msg/corpus/bdc18abc9f9705cc46de5537fbf88bc16af9ea26-2 similarity index 100% rename from examples/stun-msg/corpus/bdc18abc9f9705cc46de5537fbf88bc16af9ea26-2 rename to fuzz/stun-msg/corpus/bdc18abc9f9705cc46de5537fbf88bc16af9ea26-2 diff --git a/examples/stun-msg/corpus/c9e72ef3998f3e522d3c8e47b231a879f2372220-4 b/fuzz/stun-msg/corpus/c9e72ef3998f3e522d3c8e47b231a879f2372220-4 similarity index 100% rename from examples/stun-msg/corpus/c9e72ef3998f3e522d3c8e47b231a879f2372220-4 rename to fuzz/stun-msg/corpus/c9e72ef3998f3e522d3c8e47b231a879f2372220-4 diff --git a/examples/stun-msg/corpus/ceafbc9130e5e938b7c76df54e1a2898e734cbdd-4 b/fuzz/stun-msg/corpus/ceafbc9130e5e938b7c76df54e1a2898e734cbdd-4 similarity index 100% rename from examples/stun-msg/corpus/ceafbc9130e5e938b7c76df54e1a2898e734cbdd-4 rename to fuzz/stun-msg/corpus/ceafbc9130e5e938b7c76df54e1a2898e734cbdd-4 diff --git a/examples/stun-msg/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 b/fuzz/stun-msg/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 similarity index 100% rename from examples/stun-msg/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 rename to fuzz/stun-msg/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 diff --git a/examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7 b/fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7 similarity index 100% rename from examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7 rename to fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7 diff --git a/examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.output b/fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.output similarity index 100% rename from examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.output rename to fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.output diff --git a/examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.quoted b/fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.quoted similarity index 100% rename from examples/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.quoted rename to fuzz/stun-msg/crashers/1cc1e3902aa8cce338eb7b6e71d9552f4c6a79f7.quoted diff --git a/examples/stun-msg/suppressions/682e7dcec53e1feb7a449dd7aa573cf2a06c3e92 b/fuzz/stun-msg/suppressions/682e7dcec53e1feb7a449dd7aa573cf2a06c3e92 similarity index 100% rename from examples/stun-msg/suppressions/682e7dcec53e1feb7a449dd7aa573cf2a06c3e92 rename to fuzz/stun-msg/suppressions/682e7dcec53e1feb7a449dd7aa573cf2a06c3e92 diff --git a/examples/stun-setters/corpus/1d77b32140e3c4f620b243e87978037f10412295-1 b/fuzz/stun-setters/corpus/1d77b32140e3c4f620b243e87978037f10412295-1 similarity index 100% rename from examples/stun-setters/corpus/1d77b32140e3c4f620b243e87978037f10412295-1 rename to fuzz/stun-setters/corpus/1d77b32140e3c4f620b243e87978037f10412295-1 diff --git a/examples/stun-setters/corpus/4fbda266ea394933fa8f78a075bf6e76527458c3 b/fuzz/stun-setters/corpus/4fbda266ea394933fa8f78a075bf6e76527458c3 similarity index 100% rename from examples/stun-setters/corpus/4fbda266ea394933fa8f78a075bf6e76527458c3 rename to fuzz/stun-setters/corpus/4fbda266ea394933fa8f78a075bf6e76527458c3 diff --git a/examples/stun-setters/corpus/5040457a4f40f7c728a02bbf7956d89a5ea080bd-2 b/fuzz/stun-setters/corpus/5040457a4f40f7c728a02bbf7956d89a5ea080bd-2 similarity index 100% rename from examples/stun-setters/corpus/5040457a4f40f7c728a02bbf7956d89a5ea080bd-2 rename to fuzz/stun-setters/corpus/5040457a4f40f7c728a02bbf7956d89a5ea080bd-2 diff --git a/examples/stun-setters/corpus/7295996dbdd6e4e2736e5832469511ff69919901-2 b/fuzz/stun-setters/corpus/7295996dbdd6e4e2736e5832469511ff69919901-2 similarity index 100% rename from examples/stun-setters/corpus/7295996dbdd6e4e2736e5832469511ff69919901-2 rename to fuzz/stun-setters/corpus/7295996dbdd6e4e2736e5832469511ff69919901-2 diff --git a/examples/stun-setters/corpus/8f70d4aa3291386abd2094508ddc651679bc135b b/fuzz/stun-setters/corpus/8f70d4aa3291386abd2094508ddc651679bc135b similarity index 100% rename from examples/stun-setters/corpus/8f70d4aa3291386abd2094508ddc651679bc135b rename to fuzz/stun-setters/corpus/8f70d4aa3291386abd2094508ddc651679bc135b diff --git a/examples/stun-setters/corpus/9161a903492743c54c24213521cb04caa21af0e3 b/fuzz/stun-setters/corpus/9161a903492743c54c24213521cb04caa21af0e3 similarity index 100% rename from examples/stun-setters/corpus/9161a903492743c54c24213521cb04caa21af0e3 rename to fuzz/stun-setters/corpus/9161a903492743c54c24213521cb04caa21af0e3 diff --git a/examples/stun-setters/corpus/a36a6718f54524d846894fb04b5b885b4e43e63b-1 b/fuzz/stun-setters/corpus/a36a6718f54524d846894fb04b5b885b4e43e63b-1 similarity index 100% rename from examples/stun-setters/corpus/a36a6718f54524d846894fb04b5b885b4e43e63b-1 rename to fuzz/stun-setters/corpus/a36a6718f54524d846894fb04b5b885b4e43e63b-1 diff --git a/examples/stun-setters/corpus/a36ce2a15ed9651dd7be3649cba1d5343b5fee9d b/fuzz/stun-setters/corpus/a36ce2a15ed9651dd7be3649cba1d5343b5fee9d similarity index 100% rename from examples/stun-setters/corpus/a36ce2a15ed9651dd7be3649cba1d5343b5fee9d rename to fuzz/stun-setters/corpus/a36ce2a15ed9651dd7be3649cba1d5343b5fee9d diff --git a/examples/stun-setters/corpus/b16ae92fb2c6a3e347a4df2641e8e1e297b5574c-2 b/fuzz/stun-setters/corpus/b16ae92fb2c6a3e347a4df2641e8e1e297b5574c-2 similarity index 100% rename from examples/stun-setters/corpus/b16ae92fb2c6a3e347a4df2641e8e1e297b5574c-2 rename to fuzz/stun-setters/corpus/b16ae92fb2c6a3e347a4df2641e8e1e297b5574c-2 diff --git a/examples/stun-setters/corpus/baf9e33d5a7a70c869aa25480f668f50406a37a8 b/fuzz/stun-setters/corpus/baf9e33d5a7a70c869aa25480f668f50406a37a8 similarity index 100% rename from examples/stun-setters/corpus/baf9e33d5a7a70c869aa25480f668f50406a37a8 rename to fuzz/stun-setters/corpus/baf9e33d5a7a70c869aa25480f668f50406a37a8 diff --git a/examples/stun-setters/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 b/fuzz/stun-setters/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 similarity index 100% rename from examples/stun-setters/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 rename to fuzz/stun-setters/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 diff --git a/examples/stun-typ/corpus/02af615c9595bc675b21b30ff2de725877e47207-3 b/fuzz/stun-typ/corpus/02af615c9595bc675b21b30ff2de725877e47207-3 similarity index 100% rename from examples/stun-typ/corpus/02af615c9595bc675b21b30ff2de725877e47207-3 rename to fuzz/stun-typ/corpus/02af615c9595bc675b21b30ff2de725877e47207-3 diff --git a/examples/stun-typ/corpus/0de292b04c19b5aef164070475a47f94be80a615-1 b/fuzz/stun-typ/corpus/0de292b04c19b5aef164070475a47f94be80a615-1 similarity index 100% rename from examples/stun-typ/corpus/0de292b04c19b5aef164070475a47f94be80a615-1 rename to fuzz/stun-typ/corpus/0de292b04c19b5aef164070475a47f94be80a615-1 diff --git a/examples/stun-typ/corpus/2a89163095f14efe95934fc14a29c10d5a4d9ddf-1 b/fuzz/stun-typ/corpus/2a89163095f14efe95934fc14a29c10d5a4d9ddf-1 similarity index 100% rename from examples/stun-typ/corpus/2a89163095f14efe95934fc14a29c10d5a4d9ddf-1 rename to fuzz/stun-typ/corpus/2a89163095f14efe95934fc14a29c10d5a4d9ddf-1 diff --git a/examples/stun-typ/corpus/2f3662c1d727be578d15cd6512dc714da0092020-1 b/fuzz/stun-typ/corpus/2f3662c1d727be578d15cd6512dc714da0092020-1 similarity index 100% rename from examples/stun-typ/corpus/2f3662c1d727be578d15cd6512dc714da0092020-1 rename to fuzz/stun-typ/corpus/2f3662c1d727be578d15cd6512dc714da0092020-1 diff --git a/examples/stun-typ/corpus/9bdb77276c1852e1fb067820472812fcf6084024-1 b/fuzz/stun-typ/corpus/9bdb77276c1852e1fb067820472812fcf6084024-1 similarity index 100% rename from examples/stun-typ/corpus/9bdb77276c1852e1fb067820472812fcf6084024-1 rename to fuzz/stun-typ/corpus/9bdb77276c1852e1fb067820472812fcf6084024-1 diff --git a/examples/stun-typ/corpus/cd8fd7e44f6096d78161657475088cd3fb87398d-2 b/fuzz/stun-typ/corpus/cd8fd7e44f6096d78161657475088cd3fb87398d-2 similarity index 100% rename from examples/stun-typ/corpus/cd8fd7e44f6096d78161657475088cd3fb87398d-2 rename to fuzz/stun-typ/corpus/cd8fd7e44f6096d78161657475088cd3fb87398d-2 diff --git a/examples/stun-typ/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 b/fuzz/stun-typ/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 similarity index 100% rename from examples/stun-typ/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 rename to fuzz/stun-typ/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709 diff --git a/examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709 b/fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709 similarity index 100% rename from examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709 rename to fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709 diff --git a/examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.output b/fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.output similarity index 100% rename from examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.output rename to fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.output diff --git a/examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.quoted b/fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.quoted similarity index 100% rename from examples/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.quoted rename to fuzz/stun-typ/crashers/da39a3ee5e6b4b0d3255bfef95601890afd80709.quoted diff --git a/examples/stun-typ/suppressions/1df2ba61c49ca26ff8124345d40bca8057f55e7c b/fuzz/stun-typ/suppressions/1df2ba61c49ca26ff8124345d40bca8057f55e7c similarity index 100% rename from examples/stun-typ/suppressions/1df2ba61c49ca26ff8124345d40bca8057f55e7c rename to fuzz/stun-typ/suppressions/1df2ba61c49ca26ff8124345d40bca8057f55e7c diff --git a/examples/stun-typ/suppressions/6580320c92b36eca1e0a55e10b062ca67868a28e b/fuzz/stun-typ/suppressions/6580320c92b36eca1e0a55e10b062ca67868a28e similarity index 100% rename from examples/stun-typ/suppressions/6580320c92b36eca1e0a55e10b062ca67868a28e rename to fuzz/stun-typ/suppressions/6580320c92b36eca1e0a55e10b062ca67868a28e diff --git a/fuzz_test.go b/fuzz_test.go index 9c61085..a2f71e4 100644 --- a/fuzz_test.go +++ b/fuzz_test.go @@ -21,7 +21,7 @@ func TestMessageCrash2(t *testing.T) { func corpus(t *testing.T, function, typ string) [][]byte { var data [][]byte - p := filepath.Join("examples", function, typ) + p := filepath.Join("fuzz", function, typ) f, err := os.Open(p) if err != nil { if os.IsNotExist(err) {