tor-commits July 2018

tor-commits@lists.torproject.org

17 participants
1737 discussions

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 9aeef05f8f56f16c9ff7e147ca313cc7bab88eda Merge: 72ee0b6f7 3f8a12a63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:22:18 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3 changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] control: Make HSPOST properly parse HSADDRESS= param
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 3f8a12a63a5a1d8b4d40451586377423c95bda09 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 27 12:20:39 2018 -0400 control: Make HSPOST properly parse HSADDRESS= param For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now correctly use it and furthermore sends back a "200 OK" in case the command is successful for a v3 descriptor. Fixes #26523 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changes/bug26523 b/changes/bug26523 new file mode 100644 index 000000000..a739d240e --- /dev/null +++ b/changes/bug26523 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service, control port): + - The HSPOST command wasn't parsing properly the HSADDRESS= parameter and + thus not using it. It now handles it correctly. Fixes bug 26523; bugfix on + 0.3.3.1-alpha. Patch by "akwizgran". + diff --git a/src/or/control.c b/src/or/control.c index 028339f49..06360586e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4342,8 +4342,10 @@ handle_control_hspost(control_connection_t *conn, smartlist_t *args = smartlist_new(); - /* If any SERVER= options were specified, try parse the options line */ - if (!strcasecmpstart(argline, opt_server)) { + /* If any SERVER= or HSADDRESS= options were specified, try to parse + * the options line. */ + if (!strcasecmpstart(argline, opt_server) || + !strcasecmpstart(argline, opt_hsaddress)) { /* encoded_desc begins after a newline character */ cp = cp + 1; encoded_desc = cp; @@ -4366,11 +4368,12 @@ handle_control_hspost(control_connection_t *conn, hs_dirs = smartlist_new(); smartlist_add(hs_dirs, node->rs); } else if (!strcasecmpstart(arg, opt_hsaddress)) { - if (!hs_address_is_valid(arg)) { + const char *address = arg + strlen(opt_hsaddress); + if (!hs_address_is_valid(address)) { connection_printf_to_buf(conn, "512 Malformed onion address\r\n"); goto done; } - onion_address = arg; + onion_address = address; } else { connection_printf_to_buf(conn, "512 Unexpected argument \"%s\"\r\n", arg); @@ -4385,6 +4388,8 @@ handle_control_hspost(control_connection_t *conn, read_escaped_data(encoded_desc, encoded_desc_len, &desc_str); if (hs_control_hspost_command(desc_str, onion_address, hs_dirs) < 0) { connection_printf_to_buf(conn, "554 Invalid descriptor\r\n"); + } else { + send_control_done(conn); } tor_free(desc_str); goto done;

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit cf8c3abff179b4550404bb9978a9d2b5ad18fc34 Merge: e042727cf 9aeef05f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:22:21 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit c00527b3aee015eed559da89c6e4a1c096e50c56 Merge: 3223e303f cf8c3abff Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:22:21 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/master] Update the coverage script to look at new file locations
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit c03958dbc1db7662d1c15aa5c2fca0cd63b04ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:18:48 2018 -0400 Update the coverage script to look at new file locations --- scripts/test/coverage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test/coverage b/scripts/test/coverage index f10c5afaa..75a793a45 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -7,7 +7,7 @@ dst=$1 -for fn in src/or/*.c src/common/*.c; do +for fn in src/or/*.c src/or/*/*.c src/common/*.c src/lib/*/*.c; do BN=`basename $fn` DN=`dirname $fn` F=`echo $BN | sed -e 's/\.c$//;'`

1 0

[tor/master] Tabify all of the .am files.
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 43dc92441d843bd0be032dd8565e4316b8019f1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 09:37:28 2018 -0400 Tabify all of the .am files. --- Makefile.am | 8 ++++---- doc/include.am | 6 +++--- src/lib/encoding/include.am | 12 ++++++------ src/lib/smartlist_core/include.am | 2 +- src/or/include.am | 2 +- src/rust/tor_rust/include.am | 8 ++++---- src/test/fuzz/include.am | 2 +- src/test/include.am | 26 +++++++++++++------------- src/tools/include.am | 8 ++++---- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Makefile.am b/Makefile.am index d1c52b0f5..e77c8a92e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ TOR_UTIL_LIBS = \ src/lib/libtor-thread.a \ src/lib/libtor-memarea.a \ src/lib/libtor-math.a \ - src/lib/libtor-meminfo.a \ + src/lib/libtor-meminfo.a \ src/lib/libtor-osinfo.a \ src/lib/libtor-log.a \ src/lib/libtor-lock.a \ @@ -79,7 +79,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-thread-testing.a \ src/lib/libtor-memarea-testing.a \ src/lib/libtor-math-testing.a \ - src/lib/libtor-meminfo-testing.a \ + src/lib/libtor-meminfo-testing.a \ src/lib/libtor-osinfo-testing.a \ src/lib/libtor-term-testing.a \ src/lib/libtor-log-testing.a \ @@ -111,7 +111,7 @@ TOR_CRYPTO_TESTING_LIBS = \ # All static libraries used to link tor. TOR_INTERNAL_LIBS = \ src/or/libtor-app.a \ - src/lib/libtor-compress.a \ + src/lib/libtor-compress.a \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ src/common/libor-event.a \ @@ -122,7 +122,7 @@ TOR_INTERNAL_LIBS = \ # and tests) TOR_INTERNAL_TESTING_LIBS = \ src/or/libtor-app-testing.a \ - src/lib/libtor-compress-testing.a \ + src/lib/libtor-compress-testing.a \ $(TOR_CRYPTO_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \ src/common/libor-event-testing.a \ diff --git a/doc/include.am b/doc/include.am index 7942188ea..e429d05a4 100644 --- a/doc/include.am +++ b/doc/include.am @@ -29,9 +29,9 @@ doc_DATA = endif EXTRA_DIST+= doc/asciidoc-helper.sh \ - $(html_in) $(man_in) $(txt_in) \ - doc/state-contents.txt \ - doc/torrc_format.txt \ + $(html_in) $(man_in) $(txt_in) \ + doc/state-contents.txt \ + doc/torrc_format.txt \ doc/TUNING \ doc/HACKING/README.1st.md \ doc/HACKING/CodingStandards.md \ diff --git a/src/lib/encoding/include.am b/src/lib/encoding/include.am index cf9fb1b25..868e531b6 100644 --- a/src/lib/encoding/include.am +++ b/src/lib/encoding/include.am @@ -6,9 +6,9 @@ endif src_lib_libtor_encoding_a_SOURCES = \ src/lib/encoding/binascii.c \ - src/lib/encoding/confline.c \ - src/lib/encoding/cstring.c \ - src/lib/encoding/keyval.c \ + src/lib/encoding/confline.c \ + src/lib/encoding/cstring.c \ + src/lib/encoding/keyval.c \ src/lib/encoding/time_fmt.c src_lib_libtor_encoding_testing_a_SOURCES = \ @@ -18,7 +18,7 @@ src_lib_libtor_encoding_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/encoding/binascii.h \ - src/lib/encoding/confline.h \ - src/lib/encoding/cstring.h \ - src/lib/encoding/keyval.h \ + src/lib/encoding/confline.h \ + src/lib/encoding/cstring.h \ + src/lib/encoding/keyval.h \ src/lib/encoding/time_fmt.h diff --git a/src/lib/smartlist_core/include.am b/src/lib/smartlist_core/include.am index 9ee93fdee..99d65f0b2 100644 --- a/src/lib/smartlist_core/include.am +++ b/src/lib/smartlist_core/include.am @@ -12,7 +12,7 @@ src_lib_libtor_smartlist_core_a_SOURCES = \ src_lib_libtor_smartlist_core_testing_a_SOURCES = \ $(src_lib_libtor_smartlist_core_a_SOURCES) src_lib_libtor_smartlist_core_testing_a_CPPFLAGS = \ - $(AM_CPPFLAGS) $(TEST_CPPFLAGS) + $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_smartlist_core_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ diff --git a/src/or/include.am b/src/or/include.am index ed5d0c95c..491341374 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -174,7 +174,7 @@ src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_l src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ \ - @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ endif diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index bcf94193f..ecc821a88 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -9,16 +9,16 @@ EXTRA_CARGO_OPTIONS= CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ - $(CARGO_ONLINE) \ - --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ - $(CARGO_ONLINE) \ - --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) rm -rf "$(abs_top_builddir)/src/rust/registry" if USE_RUST diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index b09e32d43..87dfe9167 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -17,7 +17,7 @@ FUZZING_LIBS = \ @TOR_ZSTD_LIBS@ oss-fuzz-prereqs: \ - $(TOR_INTERNAL_TESTING_LIBS) + $(TOR_INTERNAL_TESTING_LIBS) noinst_HEADERS += \ src/test/fuzz/fuzzing.h diff --git a/src/test/include.am b/src/test/include.am index 1be56bbff..827b780ce 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -11,9 +11,9 @@ TESTS_ENVIRONMENT = \ export CARGO="$(CARGO)"; \ export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; \ - export CCLD="$(CCLD)"; \ - chmod +x "$(abs_top_builddir)/link_rust.sh"; \ - export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh"; + export CCLD="$(CCLD)"; \ + chmod +x "$(abs_top_builddir)/link_rust.sh"; \ + export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh"; TESTSCRIPTS = \ src/test/fuzz_static_testcases.sh \ @@ -72,8 +72,8 @@ noinst_PROGRAMS+= \ endif src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ - -DLOCALSTATEDIR="\"$(localstatedir)\"" \ - -DBINDIR="\"$(bindir)\"" \ + -DLOCALSTATEDIR="\"$(localstatedir)\"" \ + -DBINDIR="\"$(bindir)\"" \ -DTOR_UNIT_TESTS \ $(AM_CPPFLAGS) @@ -226,9 +226,9 @@ src_test_test_switch_id_LDADD = \ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ - @TOR_LDFLAGS_libevent@ + @TOR_LDFLAGS_libevent@ src_test_test_LDADD = \ - $(TOR_INTERNAL_TESTING_LIBS) \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -249,9 +249,9 @@ src_test_test_memwipe_LDADD = $(src_test_test_LDADD) src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ - @TOR_LDFLAGS_libevent@ + @TOR_LDFLAGS_libevent@ src_test_bench_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -259,9 +259,9 @@ src_test_bench_LDADD = \ @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ - @TOR_LDFLAGS_libevent@ + @TOR_LDFLAGS_libevent@ src_test_test_workqueue_LDADD = \ - $(TOR_INTERNAL_TESTING_LIBS) \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -303,7 +303,7 @@ noinst_PROGRAMS+= src/test/test-hs-ntor-cl src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_test_test_ntor_cl_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -340,7 +340,7 @@ EXTRA_DIST += \ src/test/fuzz_static_testcases.sh \ src/test/slownacl_curve25519.py \ src/test/zero_length_keys.sh \ - src/test/rust_supp.txt \ + src/test/rust_supp.txt \ src/test/test_keygen.sh \ src/test/test_key_expiration.sh \ src/test/test_zero_length_keys.sh \ diff --git a/src/tools/include.am b/src/tools/include.am index e6465233b..900154f96 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -7,7 +7,7 @@ endif src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_LDFLAGS = src_tools_tor_resolve_LDADD = \ - $(TOR_UTIL_LIBS) \ + $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_USERENV@ @@ -16,15 +16,15 @@ src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_tools_tor_cov_resolve_LDADD = \ - $(TOR_UTIL_TESTING_LIBS) \ + $(TOR_UTIL_TESTING_LIBS) \ @TOR_LIB_MATH@ @TOR_LIB_WS32@ endif src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_gencert_LDADD = \ - $(TOR_CRYPTO_LIBS) \ - $(TOR_UTIL_LIBS) \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@

1 0

[tor/master] Add make targets to show static libraries.
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 7b1832d0114f7a19a2f9bb28a6f6ce29f4ec306f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:08:54 2018 -0400 Add make targets to show static libraries. These might make it easier for people to link our stuff, and keep their scripts more robust. --- Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile.am b/Makefile.am index e77c8a92e..fe2479a64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -404,3 +404,9 @@ show-distdir-testlog: cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \ else \ cat $(distdir)/_build/$(TEST_SUITE_LOG); fi + +show-libs: + @echo $(TOR_INTERNAL_LIBS) + +show-testing-libs: + @echo $(TOR_INTERNAL_TESTING_LIBS)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2018