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

[tor/maint-0.2.8] Do not pass NULL to log(%s) in dir_server_new.
by nickm＠torproject.org 22 Aug '16

22 Aug '16

commit 0ba05313d56e6737c73d003c84eeebdfd0d40398 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 22 01:22:19 2016 -0400 Do not pass NULL to log(%s) in dir_server_new. This bug had existed since 0.2.4.7-alpha, but now that we have FallbackDirs by default, it actually matters. Fixes bug 19947; bugfix on 0.2.4.7-alpha or maybe 0.2.8.1-alpha. Rubiate wrote the patch; teor wrote the changes file. --- changes/bug19947 | 4 ++++ src/or/routerlist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug19947 b/changes/bug19947 new file mode 100644 index 0000000..b9dce8b --- /dev/null +++ b/changes/bug19947 @@ -0,0 +1,4 @@ + o Minor bugfixes (fallback directories): + - Avoid logging a NULL string pointer when loading fallback directory information. + Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha. + Report and patch by "rubiate". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 620c32d..c358872 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4337,10 +4337,10 @@ dir_server_new(int is_authority, if (nickname) tor_asprintf(&ent->description, "directory server \"%s\" at %s:%d", - nickname, hostname, (int)dir_port); + nickname, hostname_, (int)dir_port); else tor_asprintf(&ent->description, "directory server at %s:%d", - hostname, (int)dir_port); + hostname_, (int)dir_port); ent->fake_status.addr = ent->addr; tor_addr_copy(&ent->fake_status.ipv6_addr, &ent->ipv6_addr);

1 0

[snowflake/master] Log to TOR_PT_STATE_LOCATION
by arlo＠torproject.org 22 Aug '16

22 Aug '16

commit 6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Aug 21 18:32:02 2016 -0700 Log to TOR_PT_STATE_LOCATION --- client/snowflake.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index 75e999f..b1c3975 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -9,6 +9,7 @@ import ( "net" "os" "os/signal" + "path" "sync" "syscall" "time" @@ -121,7 +122,11 @@ func copyLoop(a, b io.ReadWriter) { func main() { webrtc.SetLoggingVerbosity(1) - logFile, err := os.OpenFile("snowflake.log", + stateDir, err := pt.MakeStateDir() + if err != nil { + log.Fatal(err) + } + logFile, err := os.OpenFile(path.Join(stateDir, "snowflake.log"), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatal(err)

1 0

[torsocks/master] Fix memcpy buffer overrun in gethostbyaddr()
by dgoulet＠torproject.org 21 Aug '16

21 Aug '16

commit 34b1f1cc25aa2e0e80c1aa53c4aa007680bbab13 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Aug 21 11:11:21 2016 -0400 Fix memcpy buffer overrun in gethostbyaddr() Similar from the previous commit but heap memory was copied to a static stack buffer. This is not security critical but still we shouldn't make torsocks let store let's say a malicious payload on the stack. Reported-by: Guido Vranken <guidovranken(a)gmail.com> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/gethostbyname.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index d67cc8e..e43ed4a 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -191,7 +191,11 @@ LIBC_GETHOSTBYADDR_RET_TYPE tsocks_gethostbyaddr(LIBC_GETHOSTBYADDR_SIG) goto error; } } else { - memcpy(tsocks_he_name, hostname, sizeof(tsocks_he_name)); + /* The hostname value is a NUL terminated string. Having a bigger + * hostname here than what we return implies that SOCKS5 can resolve a + * bigger hostname than 256 bytes (255 + NUL byte). */ + assert(strlen(hostname) <= (sizeof(tsocks_he_name) + 1)); + strncpy(tsocks_he_name, hostname, sizeof(tsocks_he_name)); free(hostname); tsocks_he_addr_list[0] = (char *) addr; }

1 0

[torsocks/master] Fix memcpy() buffer overrun in gethostbyname()
by dgoulet＠torproject.org 21 Aug '16

21 Aug '16

commit 23651bcebd368e09bcbd33c20acbe13153860c66 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Aug 21 10:36:39 2016 -0400 Fix memcpy() buffer overrun in gethostbyname() An extra 12 bytes of uninitialized data from the stack was copied in the static tsocks_he_addr object which is then returned in the hostent object by gethostbyname(). First of all, this patch sets the right length to tsocks_he_addr which is 4 bytes that is the IPv4 address in network byte order. Second, gethostbyname can take a valid IPv4 so check that before trying to resolve so to speed up the call. Thanks to guido for reporting this through our Hackerone bug bounty program. Reported-by: Guido Vranken <guidovranken(a)gmail.com> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/gethostbyname.c | 22 ++++++++++++++++------ src/lib/torsocks.h | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index 93a3483..d67cc8e 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -22,12 +22,13 @@ #include <stdlib.h> #include <common/log.h> +#include <common/utils.h> #include "torsocks.h" struct hostent tsocks_he; char *tsocks_he_addr_list[2]; -char tsocks_he_addr[INET_ADDRSTRLEN]; +char tsocks_he_addr[4]; char tsocks_he_name[255]; /* gethostbyname(3) */ @@ -71,10 +72,19 @@ LIBC_GETHOSTBYNAME_RET_TYPE tsocks_gethostbyname(LIBC_GETHOSTBYNAME_SIG) goto error; } - /* Resolve the given hostname through Tor. */ - ret = tsocks_tor_resolve(AF_INET, name, &ip); - if (ret < 0) { - goto error; + /* Man page specifies that it can either be an hostname or IPv4 address. + * If it's an address, go with it else try to resolve it through Tor. */ + if (utils_is_address_ipv4(name)) { + if (inet_pton(AF_INET, name, &ip) <= 0) { + goto error; + } + /* "ip" now contains the network byte order of the address. */ + } else { + /* We have a hostname so resolve it through Tor. */ + ret = tsocks_tor_resolve(AF_INET, name, &ip); + if (ret < 0) { + goto error; + } } /* Reset static host entry of tsocks. */ @@ -82,7 +92,7 @@ LIBC_GETHOSTBYNAME_RET_TYPE tsocks_gethostbyname(LIBC_GETHOSTBYNAME_SIG) memset(tsocks_he_addr_list, 0, sizeof(tsocks_he_addr_list)); memset(tsocks_he_addr, 0, sizeof(tsocks_he_addr)); - /* Copy resolved network byte order IP address. */ + /* Copy network byte order IP address. */ memcpy(tsocks_he_addr, &ip, sizeof(tsocks_he_addr)); tsocks_he_addr_list[0] = tsocks_he_addr; diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index eddd0de..bcaf92b 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -112,7 +112,7 @@ */ extern struct hostent tsocks_he; extern char *tsocks_he_addr_list[2]; -extern char tsocks_he_addr[INET_ADDRSTRLEN]; +extern char tsocks_he_addr[4]; extern char tsocks_he_name[255]; #define LIBC_GETHOSTBYNAME_NAME gethostbyname

1 0

[tor-messenger-build/master] Bump ctypes-otr to 0.0.1
by arlo＠torproject.org 20 Aug '16

20 Aug '16

commit 8624752bd2cffddf9fce3762e75fce92358f0c34 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 20 11:19:48 2016 -0700 Bump ctypes-otr to 0.0.1 * Use a signed tag --- keyring/arlolra.gpg | Bin 0 -> 75708 bytes projects/ctypes-otr/config | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyring/arlolra.gpg b/keyring/arlolra.gpg new file mode 100644 index 0000000..53f3c9e Binary files /dev/null and b/keyring/arlolra.gpg differ diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 5d7ea81..0a61b42 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,9 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: 0.0.1 git_url: https://github.com/arlolra/ctypes-otr -git_hash: f5cc35a72065d56df9e1fac47cf9a247aebc787b +git_hash: '[% c("version") %]' +gpg_keyring: arlolra.gpg +tag_gpg_id: 1 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[tor-messenger-build/updater] Reflect proper Tor Messenger version during build
by sukhbir＠torproject.org 20 Aug '16

20 Aug '16

commit 17613113cafb9937f6827a180107cd865f26cc64 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 19 20:21:41 2016 -0400 Reflect proper Tor Messenger version during build --- projects/instantbird/build | 2 ++ projects/instantbird/config | 1 - projects/instantbird/version.patch | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 8eb81e4..a397816 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -81,6 +81,8 @@ rm im/content/aboutDialog* cp $rootdir/aboutDialog* im/content/ cp $rootdir/aboutDialog.dtd im/locales/en-US/chrome/instantbird/aboutDialog.dtd +echo '[% c("var/tormessenger_version") %]' > im/config/version.txt + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 65d3316..7e3bf13 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -73,7 +73,6 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch - - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch diff --git a/projects/instantbird/version.patch b/projects/instantbird/version.patch deleted file mode 100644 index a47cde1..0000000 --- a/projects/instantbird/version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/im/config/version.txt b/im/config/version.txt -index 57b62cb..c239c60 100644 ---- a/im/config/version.txt -+++ b/im/config/version.txt -@@ -1 +1 @@ --1.6a1pre -+1.5

1 0

[tor-messenger-build/updater] Update libgcrypt to 1.6.6 for CVE-2016-6316
by sukhbir＠torproject.org 20 Aug '16

20 Aug '16

commit a82a7c1bd2258e404569841a01ea450debfbb4cc Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 18 22:39:46 2016 -0700 Update libgcrypt to 1.6.6 for CVE-2016-6316 * See https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html * Also, bump libgpg-error to 1.24 --- ChangeLog | 2 ++ projects/libgcrypt/config | 2 +- projects/libgpg-error/config | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc7841f..a392187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Tor Messenger 0.1.0b7 -- * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 * Bug 19053: Display plaintext in notifications + * Update libgpg-error to 1.24 + * Update libgcrypt to 1.6.6 for CVE-2016-6316 * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 307643f..2b43818 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.6.4 +version: 1.6.6 remote_docker: 1 var: deps: diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 48c10be..ed98a5e 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.20 +version: 1.24 remote_docker: 1 var: deps:

1 0

[tor-messenger-build/master] Reflect proper Tor Messenger version during build
by sukhbir＠torproject.org 20 Aug '16

20 Aug '16

commit 17613113cafb9937f6827a180107cd865f26cc64 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 19 20:21:41 2016 -0400 Reflect proper Tor Messenger version during build --- projects/instantbird/build | 2 ++ projects/instantbird/config | 1 - projects/instantbird/version.patch | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 8eb81e4..a397816 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -81,6 +81,8 @@ rm im/content/aboutDialog* cp $rootdir/aboutDialog* im/content/ cp $rootdir/aboutDialog.dtd im/locales/en-US/chrome/instantbird/aboutDialog.dtd +echo '[% c("var/tormessenger_version") %]' > im/config/version.txt + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 65d3316..7e3bf13 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -73,7 +73,6 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch - - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch diff --git a/projects/instantbird/version.patch b/projects/instantbird/version.patch deleted file mode 100644 index a47cde1..0000000 --- a/projects/instantbird/version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/im/config/version.txt b/im/config/version.txt -index 57b62cb..c239c60 100644 ---- a/im/config/version.txt -+++ b/im/config/version.txt -@@ -1 +1 @@ --1.6a1pre -+1.5

1 0

[tor/master] Log a warning when Testing options are deprecated.
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 3c8baa77a1d2f5a0235adc48ad5650340683e8ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 20:21:04 2016 -0400 Log a warning when Testing options are deprecated. --- src/or/config.c | 8 +++++++- src/or/confparse.c | 2 +- src/or/confparse.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a94e959..941393a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -545,7 +545,7 @@ static const config_var_t testing_tor_network_defaults[] = { "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), V(ClientBootstrapConsensusMaxDownloadTries, UINT, "80"), V(ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "80"), - V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientDNSRejectInternalAddresses, BOOL,"0"), // deprecated in 0.2.9.2-alpha V(ClientRejectInternalAddresses, BOOL, "0"), V(CountPrivateBandwidth, BOOL, "1"), V(ExitPolicyRejectPrivate, BOOL, "0"), @@ -4924,6 +4924,12 @@ options_init_from_string(const char *cf_defaults, const char *cf, tor_assert(new_var); tor_assert(old_var); old_var->initvalue = new_var->initvalue; + + if ((config_find_deprecation(&options_format, new_var->name))) { + log_warn(LD_GENERAL, "Testing options override the deprecated " + "option %s. Is that intentional?", + new_var->name); + } } /* Clear newoptions and re-initialize them with new defaults. */ diff --git a/src/or/confparse.c b/src/or/confparse.c index e9d5645..efcf4f9 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -184,7 +184,7 @@ config_free_lines(config_line_t *front) /** If key is a deprecated configuration option, return the message * explaining why it is deprecated (which may be an empty string). Return NULL * if it is not deprecated. The key field must be fully expanded. */ -static const char * +const char * config_find_deprecation(const config_format_t *fmt, const char *key) { if (BUG(fmt == NULL) || BUG(key == NULL)) diff --git a/src/or/confparse.h b/src/or/confparse.h index cf92ac4..8d915d2 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -127,6 +127,8 @@ int config_assign(const config_format_t *fmt, void *options, unsigned flags, char **msg); config_var_t *config_find_option_mutable(config_format_t *fmt, const char *key); +const char *config_find_deprecation(const config_format_t *fmt, + const char *key); const config_var_t *config_find_option(const config_format_t *fmt, const char *key);

1 0

[tor/master] Mark a big pile of options as deprecated.
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 66e610da7239e8921c0063043c07c7f2c3fd48d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 3 12:08:57 2016 -0400 Mark a big pile of options as deprecated. --- src/or/config.c | 40 +++++++++++++++++++++++++++++++++++++++- src/or/confparse.c | 7 ++++--- src/or/confparse.h | 3 +-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2f5ba6c..cf1365a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -588,6 +588,44 @@ static const config_var_t testing_tor_network_defaults[] = { #undef V #undef OBSOLETE +static const config_deprecation_t option_deprecation_notes_[] = { + { "AllowDotExit", "Unrestricted use of the .exit notation can be used for " + "a wide variety of application-level attacks." }, + { "AllowInvalidNodes", "There is no reason to enable this option; at best " + "it will make you easier to track." }, + { "AllowSingleHopCircuits", "Almost no relays actually allow single-hop " + "exits, making this option pointless." }, + { "AllowSingleHopExits", "Turning this on will make your relay easier " + "to abuse." }, + { "ClientDNSRejectInternalAddresses", "Turning this on makes your client " + "easier to fingerprint, and may open you to esoteric attacks." }, + { "ExcludeSingleHopRelays", "Turning it on makes your client easier to " + "fingerprint." }, + { "FastFirstHopPK", "Changing this option does not make your client more " + "secure, but does make it easier to fingerprint." }, + { "CloseHSClientCircutisImmediatelyOnTimeout", "This option makes your " + "client easier to fingerprint." }, + { "CloseHSServiceRendircutisImmediatelyOnTimeout", "This option makes " + "your hidden services easier to fingerprint." }, + { "WarnUnsafeSocks", "Changing this option makes it easier for you " + "to accidentally lose your anonymity by leaking DNS information" }, + { "TLSECGroup", "The default is a nice secure choice; the other option " + "is less secure." }, + { "UseNTorHandshake", "The ntor handshake should always be used." }, + + { "ControlListenAddress", "Use ControlPort instead." }, + { "DirListenAddress", "Use DirPort instead, possibly with the " + "NoAdvertise sub-option" }, + { "DNSListenAddress", "Use DNSPort instead." }, + { "SocksListenAddress", "Use SocksPort instead." }, + { "TransListenAddress", "Use TransPort instead." }, + { "NATDListenAddress", "Use NATDPort instead." }, + { "ORListenAddress", "Use ORPort instead, possibly with the " + "NoAdvertise sub-option" }, + + { NULL, NULL } +}; + #ifdef _WIN32 static char *get_windows_conf_root(void); #endif @@ -636,7 +674,7 @@ STATIC config_format_t options_format = { OR_OPTIONS_MAGIC, STRUCT_OFFSET(or_options_t, magic_), option_abbrevs_, - NULL, + option_deprecation_notes_, option_vars_, options_validate_cb, NULL diff --git a/src/or/confparse.c b/src/or/confparse.c index 233cc7c..8bd4b81 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -192,7 +192,7 @@ config_find_deprecation(const config_format_t *fmt, const char *key) if (fmt->deprecations == NULL) return NULL; - config_deprecation_t *d; + const config_deprecation_t *d; for (d = fmt->deprecations; d->name; ++d) { if (!strcasecmp(d->name, key)) { return d->why_deprecated ? d->why_deprecated : ""; @@ -486,10 +486,11 @@ config_mark_lists_fragile(const config_format_t *fmt, void *options) void warn_deprecated_option(const char *what, const char *why) { + const char *space = (why && strlen(why)) ? " " : ""; log_warn(LD_CONFIG, "The %s option is deprecated, and will most likely " - "be removed in a future version of Tor.%s (If you think this is " + "be removed in a future version of Tor.%s%s (If you think this is " "a mistake, please let us know!)", - what, why); + what, space, why); } /** If c is a syntactically valid configuration line, update diff --git a/src/or/confparse.h b/src/or/confparse.h index 415d680..87dd6d8 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -81,7 +81,7 @@ typedef struct config_format_t { off_t magic_offset; /**< Offset of the magic value within the struct. */ config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when * parsing this format. */ - config_deprecation_t *deprecations; /** List of deprecated options */ + const config_deprecation_t *deprecations; /** List of deprecated options */ config_var_t *vars; /**< List of variables we recognize, their default * values, and where we stick them in the structure. */ validate_fn_t validate_fn; /**< Function to validate config. */ @@ -133,6 +133,5 @@ const char *config_expand_abbrev(const config_format_t *fmt, int command_line, int warn_obsolete); void warn_deprecated_option(const char *what, const char *why); - #endif

1 0