November 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Appveyor: Add Windows Server 2016 to tor's build matrix
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 368aeaadffa9005febbcdf55c813812771dfe6f1 Author: teor <teor(a)torproject.org> Date: Mon Nov 5 16:21:58 2018 +1000 Appveyor: Add Windows Server 2016 to tor's build matrix Build tor on Windows Server 2012 R2 and Windows Server 2016 using Appveyor's CI. Closes ticket 28318. --- .appveyor.yml | 6 ++++++ changes/ticket28318 | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 7d8927ee3..c8db2505f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,12 @@ version: 1.0.{build} clone_depth: 50 +image: + # Windows Server 2012 R2 + - Visual Studio 2015 + # Windows Server 2016 + - Visual Studio 2017 + environment: compiler: mingw diff --git a/changes/ticket28318 b/changes/ticket28318 new file mode 100644 index 000000000..24dc1e958 --- /dev/null +++ b/changes/ticket28318 @@ -0,0 +1,3 @@ + o Minor features (Windows, continuous integration): + - Build tor on Windows Server 2012 R2 and Windows Server 2016 using + Appveyor's CI. Closes ticket 28318.

1 0

[tor/maint-0.3.5] Appveyor: Add Windows Server 2016 to tor's build matrix
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 368aeaadffa9005febbcdf55c813812771dfe6f1 Author: teor <teor(a)torproject.org> Date: Mon Nov 5 16:21:58 2018 +1000 Appveyor: Add Windows Server 2016 to tor's build matrix Build tor on Windows Server 2012 R2 and Windows Server 2016 using Appveyor's CI. Closes ticket 28318. --- .appveyor.yml | 6 ++++++ changes/ticket28318 | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 7d8927ee3..c8db2505f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,12 @@ version: 1.0.{build} clone_depth: 50 +image: + # Windows Server 2012 R2 + - Visual Studio 2015 + # Windows Server 2016 + - Visual Studio 2017 + environment: compiler: mingw diff --git a/changes/ticket28318 b/changes/ticket28318 new file mode 100644 index 000000000..24dc1e958 --- /dev/null +++ b/changes/ticket28318 @@ -0,0 +1,3 @@ + o Minor features (Windows, continuous integration): + - Build tor on Windows Server 2012 R2 and Windows Server 2016 using + Appveyor's CI. Closes ticket 28318.

1 0

[tor/master] simplify now that it uses tor's copyright and license
by arma＠torproject.org 07 Nov '18

07 Nov '18

commit 6e828ced56c04aa38fa6e2d595528bf0d046ca8c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 7 11:02:26 2018 -0500 simplify now that it uses tor's copyright and license --- src/lib/cc/ctassert.h | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h index ea3a3e119..e42976360 100644 --- a/src/lib/cc/ctassert.h +++ b/src/lib/cc/ctassert.h @@ -1,31 +1,5 @@ -/*- - * Copyright (c) 2018 The Tor Project, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright owners nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ +/* Copyright (c) 2018 The Tor Project, Inc. */ +/* See LICENSE for licensing information */ /** * \file ctassert.h

1 0

[tor/master] Change version on master to 0.4.0.0-alpha-dev.
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 9e48d9a920c1e1f8c6fc551363b28905f5580f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 10:54:03 2018 -0500 Change version on master to 0.4.0.0-alpha-dev. --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b80aa821a..4524c6b46 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.6.0-alpha-dev]) +AC_INIT([tor],[0.4.0.0-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8b9b70969..af01a2b49 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.6.0-alpha-dev" +!define VERSION "0.4.0.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index de3bf0928..cfc3bc9e9 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.6.0-alpha-dev" +#define VERSION "0.4.0.0-alpha-dev"

1 0

[tor/master] Memoize summarize_protover_flags()
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 6d93820499a8bfb19128759893b18c1437f99c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 15:04:45 2018 -0400 Memoize summarize_protover_flags() Our tests showed that this function is responsible for a huge number of our malloc/free() calls. It's a prime candidate for being memoized. Closes ticket 27225. --- changes/ticket27225 | 5 +++ src/app/main/main.c | 2 ++ src/core/or/versions.c | 82 +++++++++++++++++++++++++++++++++++++++++--------- src/core/or/versions.h | 2 ++ 4 files changed, 76 insertions(+), 15 deletions(-) diff --git a/changes/ticket27225 b/changes/ticket27225 new file mode 100644 index 000000000..4c05a269d --- /dev/null +++ b/changes/ticket27225 @@ -0,0 +1,5 @@ + o Minor features (performance): + - Avoid parsing the same protocol-versions string over and over + in summarize_protover_flags(). This should save us a huge number + of malloc calls on startup, and may reduce memory fragmentation with + some allocators. Closes ticket 27225. diff --git a/src/app/main/main.c b/src/app/main/main.c index ae87add67..04bbfadcb 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -33,6 +33,7 @@ #include "core/or/relay.h" #include "core/or/scheduler.h" #include "core/or/status.h" +#include "core/or/versions.h" #include "feature/api/tor_api.h" #include "feature/api/tor_api_internal.h" #include "feature/client/addressmap.h" @@ -791,6 +792,7 @@ tor_free_all(int postfork) dos_free_all(); circuitmux_ewma_free_all(); accounting_free_all(); + protover_summary_cache_free_all(); if (!postfork) { config_free_all(); diff --git a/src/core/or/versions.c b/src/core/or/versions.c index 06274996a..6f8eea7a6 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -377,6 +377,62 @@ sort_version_list(smartlist_t *versions, int remove_duplicates) smartlist_uniq(versions, compare_tor_version_str_ptr_, tor_free_); } +/** If there are more than this many entries, we're probably under + * some kind of weird DoS. */ +static const int MAX_PROTOVER_SUMMARY_MAP_LEN = 1024; + +/** + * Map from protover string to protover_summary_flags_t. + */ +static strmap_t *protover_summary_map = NULL; + +/** + * Helper. Given a non-NULL protover string protocols, set out + * to its summary, and memoize the result in protover_summary_map. + */ +static void +memoize_protover_summary(protover_summary_flags_t *out, + const char *protocols) +{ + if (!protover_summary_map) + protover_summary_map = strmap_new(); + + if (strmap_size(protover_summary_map) >= MAX_PROTOVER_SUMMARY_MAP_LEN) { + protover_summary_cache_free_all(); + } + + const protover_summary_flags_t *cached = + strmap_get(protover_summary_map, protocols); + + if (cached != NULL) { + /* We found a cached entry; no need to parse this one. */ + memcpy(out, cached, sizeof(protover_summary_flags_t)); + tor_assert(out->protocols_known); + return; + } + + memset(out, 0, sizeof(*out)); + out->protocols_known = 1; + out->supports_extend2_cells = + protocol_list_supports_protocol(protocols, PRT_RELAY, 2); + out->supports_ed25519_link_handshake_compat = + protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3); + out->supports_ed25519_link_handshake_any = + protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3); + out->supports_ed25519_hs_intro = + protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4); + out->supports_v3_hsdir = + protocol_list_supports_protocol(protocols, PRT_HSDIR, + PROTOVER_HSDIR_V3); + out->supports_v3_rendezvous_point = + protocol_list_supports_protocol(protocols, PRT_HSREND, + PROTOVER_HS_RENDEZVOUS_POINT_V3); + + protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out)); + cached = strmap_set(protover_summary_map, protocols, new_cached); + tor_assert(!cached); +} + /** Summarize the protocols listed in protocols into out, * falling back or correcting them based on version as appropriate. */ @@ -388,21 +444,7 @@ summarize_protover_flags(protover_summary_flags_t *out, tor_assert(out); memset(out, 0, sizeof(*out)); if (protocols) { - out->protocols_known = 1; - out->supports_extend2_cells = - protocol_list_supports_protocol(protocols, PRT_RELAY, 2); - out->supports_ed25519_link_handshake_compat = - protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3); - out->supports_ed25519_link_handshake_any = - protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3); - out->supports_ed25519_hs_intro = - protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4); - out->supports_v3_hsdir = - protocol_list_supports_protocol(protocols, PRT_HSDIR, - PROTOVER_HSDIR_V3); - out->supports_v3_rendezvous_point = - protocol_list_supports_protocol(protocols, PRT_HSREND, - PROTOVER_HS_RENDEZVOUS_POINT_V3); + memoize_protover_summary(out, protocols); } if (version && !strcmpstart(version, "Tor ")) { if (!out->protocols_known) { @@ -420,3 +462,13 @@ summarize_protover_flags(protover_summary_flags_t *out, } } } + +/** + * Free all space held in the protover_summary_map. + */ +void +protover_summary_cache_free_all(void) +{ + strmap_free(protover_summary_map, tor_free_); + protover_summary_map = NULL; +} diff --git a/src/core/or/versions.h b/src/core/or/versions.h index 0c773f3f4..4fc50a001 100644 --- a/src/core/or/versions.h +++ b/src/core/or/versions.h @@ -41,4 +41,6 @@ void summarize_protover_flags(protover_summary_flags_t *out, const char *protocols, const char *version); +void protover_summary_cache_free_all(void); + #endif /* !defined(TOR_VERSIONS_H) */

1 0

[tor/master] Merge branch 'ticket27225_squashed'
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 9807da9c20d5504a1669c70c1607b40731664e07 Merge: a7a060a63 6d9382049 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 10:47:29 2018 -0500 Merge branch 'ticket27225_squashed' changes/ticket27225 | 5 +++ src/app/main/main.c | 2 ++ src/core/or/versions.c | 82 +++++++++++++++++++++++++++++++++++++++++--------- src/core/or/versions.h | 2 ++ 4 files changed, 76 insertions(+), 15 deletions(-)

1 0

[tor/master] New macro CTASSERT(condition) to assert condition at compile-time.
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 1a6060fa4263d20d3c1ccf29163165126a413957 Author: Taylor R Campbell <campbell+tor(a)mumble.net> Date: Tue Oct 23 23:53:39 2018 +0000 New macro CTASSERT(condition) to assert condition at compile-time. To get it, use: #include "lib/cc/ctassert.h" --- src/lib/cc/ctassert.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/cc/include.am | 1 + 2 files changed, 76 insertions(+) diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h new file mode 100644 index 000000000..7307bca53 --- /dev/null +++ b/src/lib/cc/ctassert.h @@ -0,0 +1,75 @@ +/*- + * Copyright (c) 2018 Taylor R. Campbell + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/** + * \file ctassert.h + * + * \brief Compile-time assertions: CTASSERT(expression). + */ + +#ifndef TOR_CTASSERT_H +#define TOR_CTASSERT_H + +#include "lib/cc/compat_compiler.h" + +/** + * CTASSERT(expression) + * + * Trigger a compiler error if expression is false. + */ +#if __STDC_VERSION__ >= 201112L + +/* If C11 is available, just use _Static_assert. */ +#define CTASSERT(x) _Static_assert(x, #x) + +#else + +/* + * If C11 is not available, expand __COUNTER__, or __INCLUDE_LEVEL__ + * and __LINE__, or just __LINE__, with an intermediate preprocessor + * macro CTASSERT_EXPN, and then use CTASSERT_DECL to paste the + * expansions together into a unique name. + * + * We use this name as a typedef of an array type with a positive + * length if the assertion is true, and a negative length of the + * assertion is false, which is invalid and hence triggers a compiler + * error. + */ +#if defined(__COUNTER__) +#define CTASSERT(x) CTASSERT_EXPN(x, c, __COUNTER__) +#elif defined(__INCLUDE_LEVEL__) +#define CTASSERT(x) CTASSERT_EXPN(x, __INCLUDE_LEVEL__, __LINE__) +#else +#define CTASSERT(x) CTASSERT_EXPN(x, l, __LINE__) /* hope it's unique enough */ +#endif + +#define CTASSERT_EXPN(x, a, b) CTASSERT_DECL(x, a, b) +#define CTASSERT_DECL(x, a, b) \ + typedef char tor_ctassert_##a##_##b[(x) ? 1 : -1] ATTR_UNUSED + +#endif + +#endif /* !defined(TOR_CTASSERT_H) */ diff --git a/src/lib/cc/include.am b/src/lib/cc/include.am index 2ae90f97d..52cf8a9f7 100644 --- a/src/lib/cc/include.am +++ b/src/lib/cc/include.am @@ -1,4 +1,5 @@ noinst_HEADERS += \ src/lib/cc/compat_compiler.h \ + src/lib/cc/ctassert.h \ src/lib/cc/torint.h

1 0

[tor/master] Remove a tab.
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 6b706bcf199b82c6b1a87c839e8d13bf9d8e60b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 15:41:32 2018 -0500 Remove a tab. --- src/lib/cc/ctassert.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h index 5a1b137cb..674c0c2e1 100644 --- a/src/lib/cc/ctassert.h +++ b/src/lib/cc/ctassert.h @@ -38,7 +38,7 @@ /** * CTASSERT(expression) * - * Trigger a compiler error if expression is false. + * Trigger a compiler error if expression is false. */ #if __STDC_VERSION__ >= 201112L

1 0

[tor/master] Add a user of CTASSERT().
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit e69a4ad6b321dbdb63236687ac8924c301c60f9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 15:39:58 2018 -0500 Add a user of CTASSERT(). --- src/lib/net/address.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index c97a17037..a351b9df2 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -40,6 +40,7 @@ #include "lib/net/address.h" #include "lib/net/socket.h" +#include "lib/cc/ctassert.h" #include "lib/container/smartlist.h" #include "lib/ctime/di_ops.h" #include "lib/log/log.h" @@ -98,6 +99,7 @@ #if AF_UNSPEC != 0 #error We rely on AF_UNSPEC being 0. Let us know about your platform, please! #endif +CTASSERT(AF_UNSPEC == 0); /** Convert the tor_addr_t in a, with port in port, into a * sockaddr object in *sa_out of object size len. If not enough

1 0

[tor/master] Add parentheses to the ctassert macro expansions
by nickm＠torproject.org 07 Nov '18

07 Nov '18

commit 3c9dd9ef2d86463e535952528bc5151ce499a74f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 15:41:14 2018 -0500 Add parentheses to the ctassert macro expansions --- src/lib/cc/ctassert.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h index 7307bca53..5a1b137cb 100644 --- a/src/lib/cc/ctassert.h +++ b/src/lib/cc/ctassert.h @@ -43,7 +43,7 @@ #if __STDC_VERSION__ >= 201112L /* If C11 is available, just use _Static_assert. */ -#define CTASSERT(x) _Static_assert(x, #x) +#define CTASSERT(x) _Static_assert((x), #x) #else @@ -59,11 +59,12 @@ * error. */ #if defined(__COUNTER__) -#define CTASSERT(x) CTASSERT_EXPN(x, c, __COUNTER__) +#define CTASSERT(x) CTASSERT_EXPN((x), c, __COUNTER__) #elif defined(__INCLUDE_LEVEL__) -#define CTASSERT(x) CTASSERT_EXPN(x, __INCLUDE_LEVEL__, __LINE__) +#define CTASSERT(x) CTASSERT_EXPN((x), __INCLUDE_LEVEL__, __LINE__) #else -#define CTASSERT(x) CTASSERT_EXPN(x, l, __LINE__) /* hope it's unique enough */ +/* hope it's unique enough */ +#define CTASSERT(x) CTASSERT_EXPN((x), l, __LINE__) #endif #define CTASSERT_EXPN(x, a, b) CTASSERT_DECL(x, a, b)

1 0