[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 4833717d69fee558d55f6e853a22a5e8199357a2
Merge: c7dcf252f 864564725
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:46:16 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug26789                      |  4 ++
 scripts/codegen/fuzzing_include_am.py |  8 ++++
 src/test/fuzz/include.am              | 80 +++++++++++++++++++++++++++++++++++
 src/test/include.am                   |  2 +
 4 files changed, 94 insertions(+)

diff --cc src/test/fuzz/include.am
index fe735a249,39d6d3c17..09594d827
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@@ -119,15 -155,9 +140,19 @@@ src_test_fuzz_fuzz_microdesc_CPPFLAGS 
  src_test_fuzz_fuzz_microdesc_CFLAGS = $(FUZZING_CFLAGS)
  src_test_fuzz_fuzz_microdesc_LDFLAGS = $(FUZZING_LDFLAG)
  src_test_fuzz_fuzz_microdesc_LDADD = $(FUZZING_LIBS)
+ endif
  
+ if UNITTESTS_ENABLED
 +src_test_fuzz_fuzz_socks_SOURCES = \
 +	src/test/fuzz/fuzzing_common.c \
 +	src/test/fuzz/fuzz_socks.c
 +src_test_fuzz_fuzz_socks_CPPFLAGS = $(FUZZING_CPPFLAGS)
 +src_test_fuzz_fuzz_socks_CFLAGS = $(FUZZING_CFLAGS)
 +src_test_fuzz_fuzz_socks_LDFLAGS = $(FUZZING_LDFLAG)
 +src_test_fuzz_fuzz_socks_LDADD = $(FUZZING_LIBS)
++endif
 +
++if UNITTESTS_ENABLED
  src_test_fuzz_fuzz_vrs_SOURCES = \
  	src/test/fuzz/fuzzing_common.c \
  	src/test/fuzz/fuzz_vrs.c
@@@ -148,8 -180,8 +175,9 @@@ FUZZERS = 
  	src/test/fuzz/fuzz-http-connect \
  	src/test/fuzz/fuzz-iptsv2 \
  	src/test/fuzz/fuzz-microdesc \
 +	src/test/fuzz/fuzz-socks \
  	src/test/fuzz/fuzz-vrs
+ endif
  
  # ===== libfuzzer
  
@@@ -230,14 -283,9 +279,18 @@@ src_test_fuzz_lf_fuzz_microdesc_CPPFLAG
  src_test_fuzz_lf_fuzz_microdesc_CFLAGS = $(LIBFUZZER_CFLAGS)
  src_test_fuzz_lf_fuzz_microdesc_LDFLAGS = $(LIBFUZZER_LDFLAG)
  src_test_fuzz_lf_fuzz_microdesc_LDADD = $(LIBFUZZER_LIBS)
+ endif
  
+ if UNITTESTS_ENABLED
 +src_test_fuzz_lf_fuzz_socks_SOURCES = \
 +	$(src_test_fuzz_fuzz_socks_SOURCES)
 +src_test_fuzz_lf_fuzz_socks_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
 +src_test_fuzz_lf_fuzz_socks_CFLAGS = $(LIBFUZZER_CFLAGS)
 +src_test_fuzz_lf_fuzz_socks_LDFLAGS = $(LIBFUZZER_LDFLAG)
 +src_test_fuzz_lf_fuzz_socks_LDADD = $(LIBFUZZER_LIBS)
++endif
 +
++if UNITTESTS_ENABLED
  src_test_fuzz_lf_fuzz_vrs_SOURCES = \
  	$(src_test_fuzz_fuzz_vrs_SOURCES)
  src_test_fuzz_lf_fuzz_vrs_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@@ -321,12 -390,9 +396,16 @@@ src_test_fuzz_liboss_fuzz_microdesc_a_S
  	$(src_test_fuzz_fuzz_microdesc_SOURCES)
  src_test_fuzz_liboss_fuzz_microdesc_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
  src_test_fuzz_liboss_fuzz_microdesc_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+ endif
  
+ if UNITTESTS_ENABLED
 +src_test_fuzz_liboss_fuzz_socks_a_SOURCES = \
 +	$(src_test_fuzz_fuzz_socks_SOURCES)
 +src_test_fuzz_liboss_fuzz_socks_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 +src_test_fuzz_liboss_fuzz_socks_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
++endif
 +
++if UNITTESTS_ENABLED
  src_test_fuzz_liboss_fuzz_vrs_a_SOURCES = \
  	$(src_test_fuzz_fuzz_vrs_SOURCES)
  src_test_fuzz_liboss_fuzz_vrs_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
diff --cc src/test/include.am
index a749ff143,2c4da6ac4..6a4b56173
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -313,23 -334,27 +313,25 @@@ src_test_test_ntor_cl_AM_CPPFLAGS 
  
  src_test_test_hs_ntor_cl_SOURCES  = src/test/test_hs_ntor_cl.c
  src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 -src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
 -	src/common/libor-ctime.a \
 -	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
 +src_test_test_hs_ntor_cl_LDADD = \
 +	$(TOR_INTERNAL_LIBS) \
  	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
 -	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 +	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  src_test_test_hs_ntor_cl_AM_CPPFLAGS =	       \
 -	-I"$(top_srcdir)/src/or"
 +	$(AM_CPPFLAGS)
  
  
+ if UNITTESTS_ENABLED
  noinst_PROGRAMS += src/test/test-bt-cl
  src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c
 -src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
 -	src/common/libor-ctime-testing.a \
 -	src/trace/libor-trace.a \
 +src_test_test_bt_cl_LDADD = \
 +	$(TOR_UTIL_TESTING_LIBS) \
  	$(rust_ldadd) \
  	@TOR_LIB_MATH@ \
 -	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
 +	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
  src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
  src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
+ endif
  
  EXTRA_DIST += \
  	src/test/bt_test.py \