Revert "Temporarily disable compilation of the v3 hs fuzzing code"

This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403.

diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py
index e01bc8daa9c787430a95971fa3f8529ed84724f1..fee6d4494a40aa70ade8f210281099f7a79fabf8 100755 (executable)
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -7,6 +7,7 @@ FUZZERS = """
        diff-apply
        extrainfo
        hsdescv2
+       hsdescv3
        http
         http-connect
        iptsv2

diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index 472cbfc8a5544ca199ab6a8486874ab11cc00aa3..cd16dc05beeb76a4d9ddb7902fb2ba2bb032098b 100644 (file)
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -17,9 +17,8 @@ FUZZING_LIBS = \
        src/trunnel/libor-trunnel-testing.a \
        $(rust_ldadd) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-       @TOR_LIBEVENT_LIBS@ \
-       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-       @CURVE25519_LIBS@ \
+       @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+       @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
        @TOR_SYSTEMD_LIBS@ \
        @TOR_LZMA_LIBS@ \
        @TOR_ZSTD_LIBS@
@@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
 
+src_test_fuzz_fuzz_hsdescv3_SOURCES = \
+       src/test/fuzz/fuzzing_common.c \
+       src/test/fuzz/fuzz_hsdescv3.c
+src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS)
+src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS)
+src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG)
+src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS)
+
 src_test_fuzz_fuzz_http_SOURCES = \
        src/test/fuzz/fuzzing_common.c \
        src/test/fuzz/fuzz_http.c
@@ -142,6 +149,7 @@ FUZZERS = \
        src/test/fuzz/fuzz-diff-apply \
        src/test/fuzz/fuzz-extrainfo \
        src/test/fuzz/fuzz-hsdescv2 \
+       src/test/fuzz/fuzz-hsdescv3 \
        src/test/fuzz/fuzz-http \
        src/test/fuzz/fuzz-http-connect \
        src/test/fuzz/fuzz-iptsv2 \
@@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
 
+src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
+       $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG)
+src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS)
+
 src_test_fuzz_lf_fuzz_http_SOURCES = \
        $(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \
        src/test/fuzz/lf-fuzz-diff-apply \
        src/test/fuzz/lf-fuzz-extrainfo \
        src/test/fuzz/lf-fuzz-hsdescv2 \
+       src/test/fuzz/lf-fuzz-hsdescv3 \
        src/test/fuzz/lf-fuzz-http \
        src/test/fuzz/lf-fuzz-http-connect \
        src/test/fuzz/lf-fuzz-iptsv2 \
@@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 
+src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
+       $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+
 src_test_fuzz_liboss_fuzz_http_a_SOURCES = \
        $(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \
        src/test/fuzz/liboss-fuzz-diff-apply.a \
        src/test/fuzz/liboss-fuzz-extrainfo.a \
        src/test/fuzz/liboss-fuzz-hsdescv2.a \
+       src/test/fuzz/liboss-fuzz-hsdescv3.a \
        src/test/fuzz/liboss-fuzz-http.a \
        src/test/fuzz/liboss-fuzz-http-connect.a \
        src/test/fuzz/liboss-fuzz-iptsv2.a \