December 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Use event_base_new(), not event_init(), to detect libevent 2.
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 2f589e1057ce023cb9c561df48fd3d690153294f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 08:18:31 2016 -0500 Use event_base_new(), not event_init(), to detect libevent 2. (event_init() is obsoleted in libevent 2.) Fixes bug 21051; bugfix on 0.2.9.1-alpha when we dropped libevent 1 support. --- changes/bug21051 | 3 +++ configure.ac | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug21051 b/changes/bug21051 new file mode 100644 index 0000000..8bb4f80 --- /dev/null +++ b/changes/bug21051 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix Libevent detection on platforms without Libevent 1 headers + installed. Fixes bug 21051; bugfix on 0.2.9.1-alpha. diff --git a/configure.ac b/configure.ac index 7ba4a41..ed01888 100644 --- a/configure.ac +++ b/configure.ac @@ -508,12 +508,13 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T #ifdef _WIN32 #include <winsock2.h> #endif -void *event_init(void);], +struct event_base; +struct event_base *event_base_new(void);], [ #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_init(); +event_base_new(); ], [--with-libevent-dir], [/opt/libevent]) dnl Determine the incantation needed to link libevent.

1 0

[tor/master] Use event_base_new(), not event_init(), to detect libevent 2.
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 2f589e1057ce023cb9c561df48fd3d690153294f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 08:18:31 2016 -0500 Use event_base_new(), not event_init(), to detect libevent 2. (event_init() is obsoleted in libevent 2.) Fixes bug 21051; bugfix on 0.2.9.1-alpha when we dropped libevent 1 support. --- changes/bug21051 | 3 +++ configure.ac | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug21051 b/changes/bug21051 new file mode 100644 index 0000000..8bb4f80 --- /dev/null +++ b/changes/bug21051 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix Libevent detection on platforms without Libevent 1 headers + installed. Fixes bug 21051; bugfix on 0.2.9.1-alpha. diff --git a/configure.ac b/configure.ac index 7ba4a41..ed01888 100644 --- a/configure.ac +++ b/configure.ac @@ -508,12 +508,13 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T #ifdef _WIN32 #include <winsock2.h> #endif -void *event_init(void);], +struct event_base; +struct event_base *event_base_new(void);], [ #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_init(); +event_base_new(); ], [--with-libevent-dir], [/opt/libevent]) dnl Determine the incantation needed to link libevent.

1 0

[tor/master] Merge branch 'bug21051_v2' into maint-0.2.9
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit c27ae62adefb9fcdf468eef43e8a33ae3657a6bf Merge: aaeb50b 2f589e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 11:01:54 2016 -0500 Merge branch 'bug21051_v2' into maint-0.2.9 changes/bug21051 | 3 +++ configure.ac | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20991_030_01'
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 0a0e513d42581a8ae110307d1bac58ddb89a8df1 Merge: 04f21f0 e76b072 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 10:56:36 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20991_030_01' src/or/hs_intropoint.c | 8 ++++++-- src/or/hs_service.c | 5 +++-- src/trunnel/hs/cell_establish_intro.c | 12 ++++++------ src/trunnel/hs/cell_establish_intro.h | 8 ++++---- src/trunnel/hs/cell_establish_intro.trunnel | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-)

1 0

[tor/master] test: fix the generate ESTABLISH_INTRO v3 cell
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit e76b072defa5f5d6f5429d4df9afdd1335591658 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 16 12:18:05 2016 -0500 test: fix the generate ESTABLISH_INTRO v3 cell The "sig_len" fields was moved below the "end_sig_fields" in the trunnel specification so when signing the cell content, the function generating such a cell needed to be adjust. Closes #20991 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 3b5a3e7..7b12b63 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -152,8 +152,9 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, tor_assert(encoded_len > ED25519_SIG_LEN); if (ed25519_sign_prefixed(&sig, - (uint8_t*) cell_bytes_tmp, - encoded_len - ED25519_SIG_LEN, + cell_bytes_tmp, + encoded_len - + (ED25519_SIG_LEN + sizeof(cell->sig_len)), ESTABLISH_INTRO_SIG_PREFIX, &key_struct)) { log_warn(LD_BUG, "Unable to gen signature for ESTABLISH_INTRO cell.");

1 0

[tor/master] trunnel: Move ESTABLISH_INTRO cell sig_len after the end_sig_fields
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit e043b96887be4aaa103de8e4d31f8fc9008ae75d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 16 12:04:57 2016 -0500 trunnel: Move ESTABLISH_INTRO cell sig_len after the end_sig_fields Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/trunnel/hs/cell_establish_intro.c | 12 ++++++------ src/trunnel/hs/cell_establish_intro.h | 8 ++++---- src/trunnel/hs/cell_establish_intro.trunnel | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/trunnel/hs/cell_establish_intro.c b/src/trunnel/hs/cell_establish_intro.c index 02094fe..633bd7c 100644 --- a/src/trunnel/hs/cell_establish_intro.c +++ b/src/trunnel/hs/cell_establish_intro.c @@ -231,6 +231,11 @@ hs_cell_establish_intro_getconstarray_handshake_mac(const hs_cell_establish_intr { return (const uint8_t *)hs_cell_establish_intro_getarray_handshake_mac((hs_cell_establish_intro_t*)inp); } +const uint8_t * +hs_cell_establish_intro_get_end_sig_fields(const hs_cell_establish_intro_t *inp) +{ + return inp->end_sig_fields; +} uint16_t hs_cell_establish_intro_get_sig_len(const hs_cell_establish_intro_t *inp) { @@ -242,11 +247,6 @@ hs_cell_establish_intro_set_sig_len(hs_cell_establish_intro_t *inp, uint16_t val inp->sig_len = val; return 0; } -const uint8_t * -hs_cell_establish_intro_get_end_sig_fields(const hs_cell_establish_intro_t *inp) -{ - return inp->end_sig_fields; -} size_t hs_cell_establish_intro_getlen_sig(const hs_cell_establish_intro_t *inp) { @@ -518,12 +518,12 @@ hs_cell_establish_intro_parse_into(hs_cell_establish_intro_t *obj, const uint8_t CHECK_REMAINING(TRUNNEL_SHA3_256_LEN, truncated); memcpy(obj->handshake_mac, ptr, TRUNNEL_SHA3_256_LEN); remaining -= TRUNNEL_SHA3_256_LEN; ptr += TRUNNEL_SHA3_256_LEN; + obj->end_sig_fields = ptr; /* Parse u16 sig_len */ CHECK_REMAINING(2, truncated); obj->sig_len = trunnel_ntohs(trunnel_get_uint16(ptr)); remaining -= 2; ptr += 2; - obj->end_sig_fields = ptr; /* Parse u8 sig[sig_len] */ CHECK_REMAINING(obj->sig_len, truncated); diff --git a/src/trunnel/hs/cell_establish_intro.h b/src/trunnel/hs/cell_establish_intro.h index a9166f1..725d47c 100644 --- a/src/trunnel/hs/cell_establish_intro.h +++ b/src/trunnel/hs/cell_establish_intro.h @@ -19,8 +19,8 @@ struct hs_cell_establish_intro_st { struct cell_extension_st *extensions; const uint8_t *end_mac_fields; uint8_t handshake_mac[TRUNNEL_SHA3_256_LEN]; - uint16_t sig_len; const uint8_t *end_sig_fields; + uint16_t sig_len; TRUNNEL_DYNARRAY_HEAD(, uint8_t) sig; uint8_t trunnel_error_code_; }; @@ -170,6 +170,9 @@ uint8_t * hs_cell_establish_intro_getarray_handshake_mac(hs_cell_establish_intro * a const pointer */ const uint8_t * hs_cell_establish_intro_getconstarray_handshake_mac(const hs_cell_establish_intro_t *inp); +/** Return the position for end_sig_fields when we parsed this object + */ +const uint8_t * hs_cell_establish_intro_get_end_sig_fields(const hs_cell_establish_intro_t *inp); /** Return the value of the sig_len field of the * hs_cell_establish_intro_t in 'inp' */ @@ -179,9 +182,6 @@ uint16_t hs_cell_establish_intro_get_sig_len(const hs_cell_establish_intro_t *in * return -1 and set the error code on 'inp' on failure. */ int hs_cell_establish_intro_set_sig_len(hs_cell_establish_intro_t *inp, uint16_t val); -/** Return the position for end_sig_fields when we parsed this object - */ -const uint8_t * hs_cell_establish_intro_get_end_sig_fields(const hs_cell_establish_intro_t *inp); /** Return the length of the dynamic array holding the sig field of * the hs_cell_establish_intro_t in 'inp'. */ diff --git a/src/trunnel/hs/cell_establish_intro.trunnel b/src/trunnel/hs/cell_establish_intro.trunnel index 4f9e8f7..33a133b 100644 --- a/src/trunnel/hs/cell_establish_intro.trunnel +++ b/src/trunnel/hs/cell_establish_intro.trunnel @@ -26,9 +26,9 @@ struct hs_cell_establish_intro { u8 handshake_mac[TRUNNEL_SHA3_256_LEN]; /* Signature */ - u16 sig_len; /* Indicate the end of the handshake authentication data. */ @ptr end_sig_fields; + u16 sig_len; u8 sig[sig_len]; };

1 0

[tor/master] hs: Add an extra safety check on ESTABLISH_INTRO sig len
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit b0ccb6bfa505dc072c7af87261f6ac04e5e106db Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 16 12:09:22 2016 -0500 hs: Add an extra safety check on ESTABLISH_INTRO sig len Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_intropoint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index bfc7ec3..7bd80d5 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -70,7 +70,11 @@ verify_establish_intro_cell(const hs_cell_establish_intro_t *cell, ed25519_signature_t sig_struct; const uint8_t *sig_array = hs_cell_establish_intro_getconstarray_sig(cell); - if (hs_cell_establish_intro_getlen_sig(cell) != sizeof(sig_struct.sig)) { + /* Make sure the signature length is of the right size. For EXTRA safety, + * we check both the size of the array and the length which must be the + * same. Safety first!*/ + if (hs_cell_establish_intro_getlen_sig(cell) != sizeof(sig_struct.sig) || + hs_cell_establish_intro_get_sig_len(cell) != sizeof(sig_struct.sig)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "ESTABLISH_INTRO sig len is invalid"); return -1;

1 0

[tor/master] hs: Remove a useless cast in verify_establish_intro_cell()
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit db0e926849954b36f3eeba274308f2c9bb8292f1 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 16 12:12:37 2016 -0500 hs: Remove a useless cast in verify_establish_intro_cell() Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_intropoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 7bd80d5..b37c9a1 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -87,7 +87,7 @@ verify_establish_intro_cell(const hs_cell_establish_intro_t *cell, const size_t sig_msg_len = cell->end_sig_fields - msg; int sig_mismatch = ed25519_checksig_prefixed(&sig_struct, - (uint8_t*) msg, sig_msg_len, + msg, sig_msg_len, ESTABLISH_INTRO_SIG_PREFIX, &auth_key); if (sig_mismatch) {

1 0

[tor/master] Remove abort handler from the backtrace generator
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 04f21f03221a3888bde376ee1c2daa1effccbb4e Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Dec 18 15:55:37 2016 +0000 Remove abort handler from the backtrace generator The abort handler masks the exit status of the backtrace generator by capturing the abort signal from the backtrace handler and exiting with zero. Because the output of the backtrace generator is meant to be piped to `bt_test.py`, its exit status is unimportant and is currently ignored. The abort handler calls `exit(3)` which is not asynchronous-signal-safe and calling it in this context is undefined behavior [0]. Closes ticket 21026. [0] https://www.securecoding.cert.org/confluence/x/34At --- changes/ticket21026 | 3 +++ src/test/test_bt_cl.c | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/changes/ticket21026 b/changes/ticket21026 new file mode 100644 index 0000000..530a52c --- /dev/null +++ b/changes/ticket21026 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Remove undefined behavior from the backtrace generator by removing + its signal handler. Fixes bug 21026; bugfix on 0.2.5.2-alpha. diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 95b4f48..709d599 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -19,14 +19,12 @@ static int crashtype = 0; #ifdef __GNUC__ #define NOINLINE __attribute__((noinline)) -#define NORETURN __attribute__((noreturn)) #endif int crash(int x) NOINLINE; int oh_what(int x) NOINLINE; int a_tangled_web(int x) NOINLINE; int we_weave(int x) NOINLINE; -static void abort_handler(int s) NORETURN; #ifdef HAVE_CFLAG_WNULL_DEREFERENCE DISABLE_GCC_WARNING(null-dereference) @@ -76,13 +74,6 @@ we_weave(int x) return a_tangled_web(x) + a_tangled_web(x+1); } -static void -abort_handler(int s) -{ - (void)s; - exit(0); -} - int main(int argc, char **argv) { @@ -120,8 +111,6 @@ main(int argc, char **argv) configure_backtrace_handler(NULL); - signal(SIGABRT, abort_handler); - printf("%d\n", we_weave(2)); clean_up_backtrace_handler();

1 0

[tor/master] Remove dead code related to the old tor-fw-helper
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit d3c0b137aff9ae506778c74d885088cbdb535922 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 21:17:04 2016 +0000 Remove dead code related to the old tor-fw-helper This commit removes more code related to the old tor-fw-helper which was removed in ticket 13338. Closes ticket 21024. --- .gitignore | 11 ----------- configure.ac | 3 --- doc/include.am | 12 +++--------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index dc6738c..e7ef61f 100644 --- a/.gitignore +++ b/.gitignore @@ -94,11 +94,6 @@ uptime-*.json /doc/tor.html /doc/tor.html.in /doc/tor.1.xml -/doc/tor-fw-helper.1 -/doc/tor-fw-helper.1.in -/doc/tor-fw-helper.html -/doc/tor-fw-helper.html.in -/doc/tor-fw-helper.1.xml /doc/tor-gencert.1 /doc/tor-gencert.1.in /doc/tor-gencert.html @@ -214,12 +209,6 @@ uptime-*.json /src/trunnel/libor-trunnel-testing.a /src/trunnel/libor-trunnel.a -# /src/tools/tor-fw-helper/ -/src/tools/tor-fw-helper/tor-fw-helper -/src/tools/tor-fw-helper/tor-fw-helper.exe -/src/tools/tor-fw-helper/Makefile -/src/tools/tor-fw-helper/Makefile.in - # /src/win32/ /src/win32/Makefile /src/win32/Makefile.in diff --git a/configure.ac b/configure.ac index 721f5cd..1689cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -208,9 +208,6 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") -AM_CONDITIONAL(USE_FW_HELPER, test "x$natpmp" = "xtrue" || test "x$upnp" = "xtrue") -AM_CONDITIONAL(NAT_PMP, test "x$natpmp" = "xtrue") -AM_CONDITIONAL(MINIUPNPC, test "x$upnp" = "xtrue") AM_PROG_CC_C_O AC_PROG_CC_C99 diff --git a/doc/include.am b/doc/include.am index 7164a4b..0e8de23 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,17 +12,11 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify -all_mans = $(base_mans) -if USE_FW_HELPER -install_mans = $(all_mans) -else -install_mans = $(base_mans) -endif +all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify if USE_ASCIIDOC -nodist_man1_MANS = $(install_mans:=.1) -doc_DATA = $(install_mans:=.html) +nodist_man1_MANS = $(all_mans:=.1) +doc_DATA = $(all_mans:=.html) html_in = $(all_mans:=.html.in) man_in = $(all_mans:=.1.in) txt_in = $(all_mans:=.1.txt)

1 0