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

[torspec/master] Merge remote-tracking branch 'public/owning_control_fd'
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit f66d1826c0b32d307898bba081dbf8ef598d4037 Merge: 4c38382 77dce45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:30:19 2017 -0400 Merge remote-tracking branch 'public/owning_control_fd' control-spec.txt | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'public/owning_control_fd'
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit cd606d5ad36136cb7e66ac462ea945ceb3a9a7f7 Merge: e79d74072 f1bf9bf81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:28:31 2017 -0400 Merge remote-tracking branch 'public/owning_control_fd' changes/ticket23900 | 7 +++++++ src/common/compat.c | 20 ++++++++++++++------ src/common/compat.h | 1 + src/or/config.c | 25 +++++++++++++++++++++++++ src/or/connection.c | 8 +++++--- src/or/connection.h | 3 ++- src/or/control.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 4 ++++ src/or/or.h | 2 ++ 9 files changed, 103 insertions(+), 10 deletions(-) diff --cc src/or/config.c index c4d2062c8,acc31c011..b09603f5c --- a/src/or/config.c +++ b/src/or/config.c @@@ -1770,9 -1729,26 +1771,27 @@@ options_act(const or_options_t *old_opt log_warn(LD_BUG, "Previously validated client authorization for " "hidden services could not be added!"); return -1; + // LCOV_EXCL_STOP } + if (running_tor && !old_options && options->OwningControllerFD != -1) { + #ifdef _WIN32 + log_warn(LD_CONFIG, "OwningControllerFD is not supported on Windows. " + "If you neeed it, tell the Tor developers."); + return -1; + #else + const unsigned ctrl_flags = + CC_LOCAL_FD_IS_OWNER | + CC_LOCAL_FD_IS_AUTHENTICATED; + tor_socket_t ctrl_sock = (tor_socket_t)options->OwningControllerFD; + if (control_connection_add_local_fd(ctrl_sock, ctrl_flags) < 0) { + log_warn(LD_CONFIG, "Could not add local controller connection with " + "given FD."); + return -1; + } + #endif + } + /* Load state */ if (! or_state_loaded() && running_tor) { if (or_state_load())

1 0

[tor/master] Add __OwningControllerFD to allow controllers without controlports
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit f1bf9bf8198fcfaf078fdc12eb2ad5adf1901d29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 13:36:53 2017 -0400 Add __OwningControllerFD to allow controllers without controlports This feature should help programs that want to launch and manage a Tor process, as well as programs that want to launch and manage a Tor instance in a separate thread. Right now, they have to open a controlport, and then connect to it, with attendant authentication issues. This feature allows them to just start with an authenticated connection. Bug 23900. --- changes/ticket23900 | 7 +++++++ src/or/config.c | 25 +++++++++++++++++++++++++ src/or/control.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 4 ++++ src/or/or.h | 2 ++ 5 files changed, 81 insertions(+) diff --git a/changes/ticket23900 b/changes/ticket23900 new file mode 100644 index 000000000..0f949f4f4 --- /dev/null +++ b/changes/ticket23900 @@ -0,0 +1,7 @@ + o Minor features (API, embedding): + - Tor can now start with a preauthenticated control connection + created by the process that launched it. This feature is meant + for use by programs that want to launch and manage a Tor process + without allowing other programs to manage it as well. + For more information, see the __OwningControllerFD option + documented in control-spec.txt. Closes ticket 23900. diff --git a/src/or/config.c b/src/or/config.c index 832a7c967..acc31c011 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -562,6 +562,7 @@ static config_var_t option_vars_[] = { VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword, NULL), VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), + VAR("__OwningControllerFD",INT,OwningControllerFD, "-1"), V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"), V(TestingServerDownloadSchedule, CSV_INTERVAL, "0, 0, 0, 60, 60, 120, " "300, 900, 2147483647"), @@ -1730,6 +1731,24 @@ options_act(const or_options_t *old_options) return -1; } + if (running_tor && !old_options && options->OwningControllerFD != -1) { +#ifdef _WIN32 + log_warn(LD_CONFIG, "OwningControllerFD is not supported on Windows. " + "If you neeed it, tell the Tor developers."); + return -1; +#else + const unsigned ctrl_flags = + CC_LOCAL_FD_IS_OWNER | + CC_LOCAL_FD_IS_AUTHENTICATED; + tor_socket_t ctrl_sock = (tor_socket_t)options->OwningControllerFD; + if (control_connection_add_local_fd(ctrl_sock, ctrl_flags) < 0) { + log_warn(LD_CONFIG, "Could not add local controller connection with " + "given FD."); + return -1; + } +#endif + } + /* Load state */ if (! or_state_loaded() && running_tor) { if (or_state_load()) @@ -4572,6 +4591,12 @@ options_transition_allowed(const or_options_t *old, return -1; } + if (old->OwningControllerFD != new_val->OwningControllerFD) { + *msg = tor_strdup("While Tor is running, changing OwningControllerFD " + "is not allowed."); + return -1; + } + if (sandbox_is_active()) { #define SB_NOCHANGE_STR(opt) \ do { \ diff --git a/src/or/control.c b/src/or/control.c index 8173cb1e5..2e4bae2db 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -549,6 +549,49 @@ decode_escaped_string(const char *start, size_t in_len_max, return end+1; } +/** Create and add a new controller connection on sock. If + * CC_LOCAL_FD_IS_OWNER is set in flags, this Tor process should + * exit when the connection closes. If CC_LOCAL_FD_IS_AUTHENTICATED + * is set, then the connection does not need to authenticate. + */ +int +control_connection_add_local_fd(tor_socket_t sock, unsigned flags) +{ + if (BUG(! SOCKET_OK(sock))) + return -1; + const int is_owner = !!(flags & CC_LOCAL_FD_IS_OWNER); + const int is_authenticated = !!(flags & CC_LOCAL_FD_IS_AUTHENTICATED); + control_connection_t *control_conn = control_connection_new(AF_UNSPEC); + connection_t *conn = TO_CONN(control_conn); + conn->s = sock; + tor_addr_make_unspec(&conn->addr); + conn->port = 1; + conn->address = tor_strdup("<local socket>"); + + /* We take ownership of this socket so that later, when we close it, + * we don't freak out. */ + tor_take_socket_ownership(sock); + + if (set_socket_nonblocking(sock) < 0 || + connection_add(conn) < 0) { + connection_free(conn); + return -1; + } + + control_conn->is_owning_control_connection = is_owner; + + if (connection_init_accepted_conn(conn, NULL) < 0) { + connection_mark_for_close(conn); + return -1; + } + + if (is_authenticated) { + conn->state = CONTROL_CONN_STATE_OPEN; + } + + return 0; +} + /** Acts like sprintf, but writes its formatted string to the end of * conn-\>outbuf. */ static void diff --git a/src/or/control.h b/src/or/control.h index e957b593a..7ec182cb7 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -27,6 +27,10 @@ void control_ports_write_to_file(void); #define LOG_FN_CONN(conn, args) \ CONN_LOG_PROTECT(conn, log_fn args) +#define CC_LOCAL_FD_IS_OWNER (1u<<0) +#define CC_LOCAL_FD_IS_AUTHENTICATED (1u<<1) +int control_connection_add_local_fd(tor_socket_t sock, unsigned flags); + int connection_control_finished_flushing(control_connection_t *conn); int connection_control_reached_eof(control_connection_t *conn); void connection_control_closed(control_connection_t *conn); diff --git a/src/or/or.h b/src/or/or.h index 5bd07ba6a..048dbc591 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4066,6 +4066,8 @@ typedef struct { /** Process specifier for a controller that ‘owns’ this Tor * instance. Tor will terminate if its owning controller does. */ char *OwningControllerProcess; + /** FD specifier for a controller that owns this Tor instance. */ + int OwningControllerFD; int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how * long do we wait before exiting? */

1 0

[tor/master] New function for Tor to treat itself as the "owner" of a socket
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 4eb5753bd29b24fd5a523499add35a6214293cd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 12:14:30 2017 -0400 New function for Tor to treat itself as the "owner" of a socket Our socket accounting functions assumed that we'd never be asked to close a socket that we didn't open ourselves. But now we want to support taking control sockets that we inherit -- so we need a way of taking ownership of them, so we don't freak out later on when we close them. --- src/common/compat.c | 18 +++++++++++++----- src/common/compat.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 97eab94e0..38693b21f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1273,11 +1273,22 @@ tor_open_socket_with_extensions(int domain, int type, int protocol, goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: + tor_take_socket_ownership(s); + return s; +} + +/** + * For socket accounting: remember that we are the owner of the socket + * s. This will prevent us from overallocating sockets, and prevent us + * from asserting later when we close the socket s. + */ +void +tor_take_socket_ownership(tor_socket_t s) +{ socket_accounting_lock(); ++n_sockets_open; mark_socket_open(s); socket_accounting_unlock(); - return s; } /** As accept(), but counts the number of open sockets. */ @@ -1358,10 +1369,7 @@ tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: - socket_accounting_lock(); - ++n_sockets_open; - mark_socket_open(s); - socket_accounting_unlock(); + tor_take_socket_ownership(s); return s; } diff --git a/src/common/compat.h b/src/common/compat.h index fee9e6587..0aabee68c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -483,6 +483,7 @@ typedef int socklen_t; int tor_close_socket_simple(tor_socket_t s); MOCK_DECL(int, tor_close_socket, (tor_socket_t s)); +void tor_take_socket_ownership(tor_socket_t s); tor_socket_t tor_open_socket_with_extensions( int domain, int type, int protocol, int cloexec, int nonblock);

1 0

[tor/master] Expose connection_init_accepted_conn.
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit f0daaf8d60be8bfcfaa99e3a878cd90967a84bb0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 12:55:09 2017 -0400 Expose connection_init_accepted_conn. --- src/or/connection.c | 8 +++++--- src/or/connection.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 632a83365..431ab3a3a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -118,8 +118,6 @@ static connection_t *connection_listener_new( const port_cfg_t *portcfg); static void connection_init(time_t now, connection_t *conn, int type, int socket_family); -static int connection_init_accepted_conn(connection_t *conn, - const listener_connection_t *listener); static int connection_handle_listener_read(connection_t *conn, int new_type); static int connection_bucket_should_increase(int bucket, or_connection_t *conn); @@ -1662,11 +1660,15 @@ connection_handle_listener_read(connection_t *conn, int new_type) } /** Initialize states for newly accepted connection conn. + * * If conn is an OR, start the TLS handshake. + * * If conn is a transparent AP, get its original destination * and place it in circuit_wait. + * + * The listener parameter is only used for AP connections. */ -static int +int connection_init_accepted_conn(connection_t *conn, const listener_connection_t *listener) { diff --git a/src/or/connection.h b/src/or/connection.h index 4a5bd6971..7f488676e 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -26,7 +26,8 @@ entry_connection_t *entry_connection_new(int type, int socket_family); control_connection_t *control_connection_new(int socket_family); listener_connection_t *listener_connection_new(int type, int socket_family); connection_t *connection_new(int type, int socket_family); - +int connection_init_accepted_conn(connection_t *conn, + const listener_connection_t *listener); void connection_link_connections(connection_t *conn_a, connection_t *conn_b); MOCK_DECL(void,connection_free,(connection_t *conn)); void connection_free_all(void);

1 0

[tor/master] Make the mark_socket_open() no-op treat the socket as used.
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 5bcd8dc5c482da4da71402cd06b0ecc709f05493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 12:13:26 2017 -0400 Make the mark_socket_open() no-op treat the socket as used. This is preliminary for extracting the "take socket ownership" code into its own function. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index 7fe97488e..97eab94e0 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1186,7 +1186,7 @@ mark_socket_open(tor_socket_t s) bitarray_set(open_sockets, s); } #else /* !(defined(DEBUG_SOCKET_COUNTING)) */ -#define mark_socket_open(s) STMT_NIL +#define mark_socket_open(s) ((void) (s)) #endif /* defined(DEBUG_SOCKET_COUNTING) */ /** @} */

1 0

[tor/master] missing changes file for 22605
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit e79d74072b2a1087d4527912087573412b7da3a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:27:57 2017 -0400 missing changes file for 22605 --- changes/bug22605 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22605 b/changes/bug22605 new file mode 100644 index 000000000..fdfe20202 --- /dev/null +++ b/changes/bug22605 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - When running with the sandbox enabled, reload configuration files + correctly even when %include was used. Previously we + would crash. Fixes bug 22605; bugfix on 0.3.1. + Patch from Daniel Pinto.

1 0

[tor/master] Add a small library to emulate tor_run_main() with exec()
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit e8682c85945b3283adb113f29f9fbd7977a052aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 19:34:19 2017 -0400 Add a small library to emulate tor_run_main() with exec() --- .gitignore | 1 + configure.ac | 1 + src/tools/include.am | 5 ++++ src/tools/tor_runner.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/.gitignore b/.gitignore index 671288d41..b8642ee76 100644 --- a/.gitignore +++ b/.gitignore @@ -211,6 +211,7 @@ uptime-*.json /src/test/fuzz/lf-fuzz-* # /src/tools/ +/src/tools/libtorrunner.a /src/tools/tor-checkkey /src/tools/tor-resolve /src/tools/tor-cov-resolve diff --git a/configure.ac b/configure.ac index c02646426..b9e737cf4 100644 --- a/configure.ac +++ b/configure.ac @@ -375,6 +375,7 @@ AH_BOTTOM([ AM_CONDITIONAL(BUILD_NT_SERVICES, test "x$bwin32" = "xtrue") +AM_CONDITIONAL(BUILD_LIBTORRUNNER, test "x$bwin32" != "xtrue") dnl Enable C99 when compiling with MIPSpro AC_MSG_CHECKING([for MIPSpro compiler]) diff --git a/src/tools/include.am b/src/tools/include.am index 37936c742..92cc3f10a 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -45,3 +45,8 @@ src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ endif EXTRA_DIST += src/tools/tor-fw-helper/README + +if BUILD_LIBTORRUNNER +noinst_LIBRARIES += src/tools/libtorrunner.a +src_tools_libtorrunner_a_SOURCES = src/tools/tor_runner.c src/or/tor_api.c +endif diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c new file mode 100644 index 000000000..ee35b72df --- /dev/null +++ b/src/tools/tor_runner.c @@ -0,0 +1,78 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "tor_api.h" +#include "tor_api_internal.h" + +#include "orconfig.h" +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#include <stdlib.h> +#include <string.h> + +#ifndef __GNUC__ +#define __attribute__(x) +#endif + +static void child(const tor_main_configuration_t *cfg) + __attribute__((noreturn)); + +int +tor_run_main(const tor_main_configuration_t *cfg) +{ + pid_t pid = fork(); + if (pid == 0) { + child(cfg); + exit(0); /* Unreachable */ + } + + pid_t stopped_pid; + int status = 0; + do { + stopped_pid = waitpid(pid, &status, 0); + } while (stopped_pid == -1); + + /* Note: these return values are not documented. No return value is + * documented! */ + + if (stopped_pid != pid) { + return -99999; + } + if (WIFSTOPPED(status)) { + return WEXITSTATUS(status); + } + if (WIFSIGNALED(status)) { + return -WTERMSIG(status); + } + + return -999988; +} + +static void +child(const tor_main_configuration_t *cfg) +{ + /* XXXX Close unused file descriptors. */ + + char **args = calloc(cfg->argc+1, sizeof(char *)); + memcpy(args, cfg->argv, cfg->argc * sizeof(char *)); + args[cfg->argc] = NULL; + + int rv = execv(BINDIR "/tor", args); + + if (rv < 0) { + exit(254); + } else { + abort(); /* Unreachable */ + } +} +

1 0

[tor/master] Move tor_git_revision into a new module.
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 72b5e4a2db4282002fe50e11c2b8a79e108d30f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 13:49:35 2017 -0400 Move tor_git_revision into a new module. At first, we put the tor_git_revision constant in tor_main.c, so that we wouldn't have to recompile config.o every time the git revision changed. But putting it there had unintended side effect of forcing every program that wanted to link libor.a (including test, test-slow, the fuzzers, the benchmarks, etc) to declare their own tor_git_revision instance. That's not very nice, especially since we want to start supporting others who want to link against Tor (see 23846). So, create a new git_revision.c file that only contains this constant, and remove the duplicated boilerplate from everywhere else. Part of implementing ticket 23845. --- changes/ticket23845 | 4 ++++ src/or/config.c | 3 +-- src/or/git_revision.c | 17 +++++++++++++++++ src/or/git_revision.h | 12 ++++++++++++ src/or/include.am | 2 ++ src/or/tor_main.c | 12 ------------ src/test/bench.c | 5 ----- src/test/fuzz/fuzzing_common.c | 3 --- src/test/testing_common.c | 6 ------ 9 files changed, 36 insertions(+), 28 deletions(-) diff --git a/changes/ticket23845 b/changes/ticket23845 new file mode 100644 index 000000000..01f57374b --- /dev/null +++ b/changes/ticket23845 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - The tor_git_revision[] constant no longer needs to be redeclared + by everything that links against the rest of Tor. Done as part + of ticket 23845, to simplify our external API. diff --git a/src/or/config.c b/src/or/config.c index 832a7c967..57d919e72 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -82,6 +82,7 @@ #include "dirvote.h" #include "dns.h" #include "entrynodes.h" +#include "git_revision.h" #include "geoip.h" #include "hibernate.h" #include "main.h" @@ -879,8 +880,6 @@ set_options(or_options_t *new_val, char **msg) return 0; } -extern const char tor_git_revision[]; /* from tor_main.c */ - /** The version of this Tor process, as parsed. */ static char *the_tor_version = NULL; /** A shorter version of this Tor process's version, for export in our router diff --git a/src/or/git_revision.c b/src/or/git_revision.c new file mode 100644 index 000000000..8f326b875 --- /dev/null +++ b/src/or/git_revision.c @@ -0,0 +1,17 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "git_revision.h" + +/** String describing which Tor Git repository version the source was + * built from. This string is generated by a bit of shell kludging in + * src/or/include.am, and is usually right. + */ +const char tor_git_revision[] = +#ifndef _MSC_VER +#include "micro-revision.i" +#endif + ""; + diff --git a/src/or/git_revision.h b/src/or/git_revision.h new file mode 100644 index 000000000..1ceaeedf1 --- /dev/null +++ b/src/or/git_revision.h @@ -0,0 +1,12 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_GIT_REVISION_H +#define TOR_GIT_REVISION_H + +extern const char tor_git_revision[]; + +#endif + diff --git a/src/or/include.am b/src/or/include.am index 7216aba9a..662bd4807 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -51,6 +51,7 @@ LIBTOR_A_SOURCES = \ src/or/geoip.c \ src/or/entrynodes.c \ src/or/ext_orport.c \ + src/or/git_revision.c \ src/or/hibernate.c \ src/or/hs_cache.c \ src/or/hs_cell.c \ @@ -189,6 +190,7 @@ ORHEADERS = \ src/or/fp_pair.h \ src/or/geoip.h \ src/or/entrynodes.h \ + src/or/git_revision.h \ src/or/hibernate.h \ src/or/hs_cache.h \ src/or/hs_cell.h \ diff --git a/src/or/tor_main.c b/src/or/tor_main.c index a3a883860..9f57f516e 100644 --- a/src/or/tor_main.c +++ b/src/or/tor_main.c @@ -3,18 +3,6 @@ * Copyright (c) 2007-2017, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -extern const char tor_git_revision[]; - -/** String describing which Tor Git repository version the source was - * built from. This string is generated by a bit of shell kludging in - * src/or/include.am, and is usually right. - */ -const char tor_git_revision[] = -#ifndef _MSC_VER -#include "micro-revision.i" -#endif - ""; - /** * \file tor_main.c * \brief Stub module containing a main() function. diff --git a/src/test/bench.c b/src/test/bench.c index b7b123eee..f30b60990 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -3,11 +3,6 @@ * Copyright (c) 2007-2017, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -extern const char tor_git_revision[]; -/* Ordinarily defined in tor_main.c; this bit is just here to provide one - * since we're not linking to tor_main.c */ -const char tor_git_revision[] = ""; - /** * \file bench.c * \brief Benchmarks for lower level Tor modules. diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 7aee92df6..cd88ce560 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -9,9 +9,6 @@ #include "crypto.h" #include "crypto_ed25519.h" -extern const char tor_git_revision[]; -const char tor_git_revision[] = ""; - static or_options_t *mock_options = NULL; static const or_options_t * mock_get_options(void) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 7e9c47b48..e43fa46c8 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -3,12 +3,6 @@ * Copyright (c) 2007-2017, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -extern const char tor_git_revision[]; - -/* Ordinarily defined in tor_main.c; this bit is just here to provide one - * since we're not linking to tor_main.c */ -const char tor_git_revision[] = ""; - /** * \file test_common.c * \brief Common pieces to implement unit tests.

1 0

[tor/master] tor_runner.c: Add a circumlocution and a caveat.
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 221f5238aed47f4436916a1da5c6f0423c7fe3e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:21:11 2017 -0400 tor_runner.c: Add a circumlocution and a caveat. --- src/tools/tor_runner.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index ac398742d..9ed2ee577 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -19,6 +19,10 @@ * practice. */ +/* NOTE: This module is supposed to work without the standard Tor utility + * functions. Don't add more dependencies! + */ + #include "tor_api.h" #include "tor_api_internal.h" @@ -73,12 +77,16 @@ tor_run_main(const tor_main_configuration_t *cfg) return -999988; } +/* circumlocution to avoid getting warned about calling calloc instead of + * tor_calloc. */ +#define real_calloc calloc + static void child(const tor_main_configuration_t *cfg) { /* XXXX Close unused file descriptors. */ - char **args = calloc(cfg->argc+1, sizeof(char *)); + char **args = real_calloc(cfg->argc+1, sizeof(char *)); memcpy(args, cfg->argv, cfg->argc * sizeof(char *)); args[cfg->argc] = NULL;

1 0