April 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit b00a6211c5680ae79732d701732f7481cf353526 Merge: 42731f6 3dc52e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 10:49:59 2013 -0400 Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4 changes/bug7143 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Correctly copy microdescs/extrinfos with internal NUL bytes
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit acd72d4e3e47c2d81d9f3586d227069b9c87094e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 26 18:01:06 2013 -0500 Correctly copy microdescs/extrinfos with internal NUL bytes Fixes bug 8037; bugfix on 0.2.0.1-alpha; reported by cypherpunks. --- changes/bug8037 | 4 ++++ src/common/util.c | 14 ++++++++++++++ src/common/util.h | 3 +++ src/or/routerparse.c | 4 ++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug8037 b/changes/bug8037 new file mode 100644 index 0000000..5f3c1a3 --- /dev/null +++ b/changes/bug8037 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correctly store microdescriptors and extrainfo descriptors with + an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha. + Bug reported by "cypherpunks". diff --git a/src/common/util.c b/src/common/util.c index 49ec75d..71b77e2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -282,6 +282,20 @@ tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) return dup; } +/** As tor_memdup(), but add an extra 0 byte at the end of the resulting + * memory. */ +void * +tor_memdup_nulterm(const void *mem, size_t len DMALLOC_PARAMS) +{ + char *dup; + tor_assert(len < SIZE_T_CEILING+1); + tor_assert(mem); + dup = tor_malloc_(len+1 DMALLOC_FN_ARGS); + memcpy(dup, mem, len); + dup[len] = '\0'; + return dup; +} + /** Helper for places that need to take a function pointer to the right * spelling of "free()". */ void diff --git a/src/common/util.h b/src/common/util.h index 59c43a4..170fb23 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -83,6 +83,8 @@ char *tor_strndup_(const char *s, size_t n DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); void *tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); +void *tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS) + ATTR_MALLOC ATTR_NONNULL((1)); void tor_free_(void *mem); #ifdef USE_DMALLOC extern int dmalloc_free(const char *file, const int line, void *pnt, @@ -117,6 +119,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_strdup(s) tor_strdup_(s DMALLOC_ARGS) #define tor_strndup(s, n) tor_strndup_(s, n DMALLOC_ARGS) #define tor_memdup(s, n) tor_memdup_(s, n DMALLOC_ARGS) +#define tor_memdup_nulterm(s, n) tor_memdup_nulterm_(s, n DMALLOC_ARGS) void tor_log_mallinfo(int severity); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b945ea6..23dae38 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, extrainfo = tor_malloc_zero(sizeof(extrainfo_t)); extrainfo->cache_info.is_extrainfo = 1; if (cache_copy) - extrainfo->cache_info.signed_descriptor_body = tor_strndup(s, end-s); + extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s); extrainfo->cache_info.signed_descriptor_len = end-s; memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN); @@ -4237,7 +4237,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md->bodylen = start_of_next_microdesc - cp; if (copy_body) - md->body = tor_strndup(cp, md->bodylen); + md->body = tor_memdup_nulterm(cp, md->bodylen); else md->body = (char*)cp; md->off = cp - start;

1 0

[tor/master] Reject most directory documents with an internal NUL.
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 0cf2c01dbd9b86d396a55186e0656db33c7929d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 13:49:04 2013 -0400 Reject most directory documents with an internal NUL. (Specifically, we reject all the ones that aren't NUL-terminated, since a NUL-terminated thing can't have a NUL in the middle.) Another fix for #8037. --- changes/bug8037 | 4 ++++ src/or/routerparse.c | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/changes/bug8037 b/changes/bug8037 index 5f3c1a3..989745f 100644 --- a/changes/bug8037 +++ b/changes/bug8037 @@ -2,3 +2,7 @@ - Correctly store microdescriptors and extrainfo descriptors with an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha. Bug reported by "cypherpunks". + + o Minor features: + - Reject as invalid most directory objects containing a + NUL. Belt-and-suspender fix for bug 8037. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 23dae38..2c345ae 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3902,8 +3902,15 @@ tokenize_string(memarea_t *area, tor_assert(area); s = &start; - if (!end) + if (!end) { end = start+strlen(start); + } else { + /* it's only meaningful to check for nuls if we got an end-of-string ptr */ + if (memchr(start, '\0', end-start)) { + log_warn(LD_DIR, "parse error: internal NUL character."); + return -1; + } + } for (i = 0; i < NIL_; ++i) counts[i] = 0;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit bbc049a7561f8247db130a7b9115ce4ff392cf99 Merge: d34d0b4 42731f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 10:48:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8037 | 8 ++++++++ src/common/util.c | 14 ++++++++++++++ src/common/util.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- 4 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'bug8037_squashed' into maint-0.2.4
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 42731f69efc1f7b0614a33cd6ea7a70903bfc98b Merge: a6545d6 0cf2c01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 10:45:45 2013 -0400 Merge branch 'bug8037_squashed' into maint-0.2.4 changes/bug8037 | 8 ++++++++ src/common/util.c | 14 ++++++++++++++ src/common/util.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- 4 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] Correctly copy microdescs/extrinfos with internal NUL bytes
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit acd72d4e3e47c2d81d9f3586d227069b9c87094e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 26 18:01:06 2013 -0500 Correctly copy microdescs/extrinfos with internal NUL bytes Fixes bug 8037; bugfix on 0.2.0.1-alpha; reported by cypherpunks. --- changes/bug8037 | 4 ++++ src/common/util.c | 14 ++++++++++++++ src/common/util.h | 3 +++ src/or/routerparse.c | 4 ++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug8037 b/changes/bug8037 new file mode 100644 index 0000000..5f3c1a3 --- /dev/null +++ b/changes/bug8037 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correctly store microdescriptors and extrainfo descriptors with + an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha. + Bug reported by "cypherpunks". diff --git a/src/common/util.c b/src/common/util.c index 49ec75d..71b77e2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -282,6 +282,20 @@ tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) return dup; } +/** As tor_memdup(), but add an extra 0 byte at the end of the resulting + * memory. */ +void * +tor_memdup_nulterm(const void *mem, size_t len DMALLOC_PARAMS) +{ + char *dup; + tor_assert(len < SIZE_T_CEILING+1); + tor_assert(mem); + dup = tor_malloc_(len+1 DMALLOC_FN_ARGS); + memcpy(dup, mem, len); + dup[len] = '\0'; + return dup; +} + /** Helper for places that need to take a function pointer to the right * spelling of "free()". */ void diff --git a/src/common/util.h b/src/common/util.h index 59c43a4..170fb23 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -83,6 +83,8 @@ char *tor_strndup_(const char *s, size_t n DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); void *tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); +void *tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS) + ATTR_MALLOC ATTR_NONNULL((1)); void tor_free_(void *mem); #ifdef USE_DMALLOC extern int dmalloc_free(const char *file, const int line, void *pnt, @@ -117,6 +119,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_strdup(s) tor_strdup_(s DMALLOC_ARGS) #define tor_strndup(s, n) tor_strndup_(s, n DMALLOC_ARGS) #define tor_memdup(s, n) tor_memdup_(s, n DMALLOC_ARGS) +#define tor_memdup_nulterm(s, n) tor_memdup_nulterm_(s, n DMALLOC_ARGS) void tor_log_mallinfo(int severity); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b945ea6..23dae38 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, extrainfo = tor_malloc_zero(sizeof(extrainfo_t)); extrainfo->cache_info.is_extrainfo = 1; if (cache_copy) - extrainfo->cache_info.signed_descriptor_body = tor_strndup(s, end-s); + extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s); extrainfo->cache_info.signed_descriptor_len = end-s; memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN); @@ -4237,7 +4237,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md->bodylen = start_of_next_microdesc - cp; if (copy_body) - md->body = tor_strndup(cp, md->bodylen); + md->body = tor_memdup_nulterm(cp, md->bodylen); else md->body = (char*)cp; md->off = cp - start;

1 0

[tor/maint-0.2.4] Reject most directory documents with an internal NUL.
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 0cf2c01dbd9b86d396a55186e0656db33c7929d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 13:49:04 2013 -0400 Reject most directory documents with an internal NUL. (Specifically, we reject all the ones that aren't NUL-terminated, since a NUL-terminated thing can't have a NUL in the middle.) Another fix for #8037. --- changes/bug8037 | 4 ++++ src/or/routerparse.c | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/changes/bug8037 b/changes/bug8037 index 5f3c1a3..989745f 100644 --- a/changes/bug8037 +++ b/changes/bug8037 @@ -2,3 +2,7 @@ - Correctly store microdescriptors and extrainfo descriptors with an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha. Bug reported by "cypherpunks". + + o Minor features: + - Reject as invalid most directory objects containing a + NUL. Belt-and-suspender fix for bug 8037. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 23dae38..2c345ae 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3902,8 +3902,15 @@ tokenize_string(memarea_t *area, tor_assert(area); s = &start; - if (!end) + if (!end) { end = start+strlen(start); + } else { + /* it's only meaningful to check for nuls if we got an end-of-string ptr */ + if (memchr(start, '\0', end-start)) { + log_warn(LD_DIR, "parse error: internal NUL character."); + return -1; + } + } for (i = 0; i < NIL_; ++i) counts[i] = 0;

1 0

[tor/maint-0.2.4] Merge branch 'bug8037_squashed' into maint-0.2.4
by nickm＠torproject.org 18 Apr '13

18 Apr '13

commit 42731f69efc1f7b0614a33cd6ea7a70903bfc98b Merge: a6545d6 0cf2c01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 10:45:45 2013 -0400 Merge branch 'bug8037_squashed' into maint-0.2.4 changes/bug8037 | 8 ++++++++ src/common/util.c | 14 ++++++++++++++ src/common/util.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- 4 files changed, 35 insertions(+), 3 deletions(-)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 99a1708497a5171a5e18aab8a6b1cd6c07237ca1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 14:45:43 2013 +0000 Update translations for vidalia_help --- eu/server.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/server.po b/eu/server.po index b63bfaf..5fb9fc5 100644 --- a/eu/server.po +++ b/eu/server.po @@ -1,12 +1,12 @@ # # Translators: -# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012-2013. +# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-15 08:38+0000\n" +"PO-Revision-Date: 2013-04-17 14:38+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -323,7 +323,7 @@ msgid "" "uncheck all of the checkboxes, your relay is still useful to the Tor " "network. Your relay will allow other Tor users to connect to the Tor " "network and will help relay traffic between other Tor relays." -msgstr "" +msgstr "Zure erreletik Tor sarearen kanpoaldera beste Tor erabiltzaileek konekta daitezen baimendu nahi ez baduzu, kontrol-lauki guztiak desmarka ditzakezu. Nahiz eta kontrol-lauki guztiak desmarkatu, zure errelea oraindik erabilgarria da Tor sarearentzat. Zure erreleak beste Tor erabiltzaileek Tor sarera konekta daitezen baimenduko du eta beste Tor errelen artean trafikoa erreleatzen lagunduko du." #. type: Content of: <html><body> #: en/server.html:182

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 6920cbbb9847d9b9e2949a80b838b81f51d0ec8e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 14:45:21 2013 +0000 Update translations for tsum --- eu/short-user-manual_eu_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/short-user-manual_eu_noimg.xhtml b/eu/short-user-manual_eu_noimg.xhtml index 1f44303..f1d0c00 100644 --- a/eu/short-user-manual_eu_noimg.xhtml +++ b/eu/short-user-manual_eu_noimg.xhtml @@ -6,7 +6,7 @@ <body> <h1 id="the-short-user-manual">Erabiltzaile Eskuliburu Laburra</h1> This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org. - Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away. + Mesedez kontuan izan bolondreski sostengua ematen ari garela, eta email asko jasotzen ditugu egunero. Ez dago larritu beharrik erantzun azkarrik jasotzen ez baduzu. <h2 id="how-tor-works">Nola egiten du lan Tor</h2> Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as relays) in the Tor network, before the traffic is sent out onto the public Internet. The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay. @@ -16,7 +16,7 @@ The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor. There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder. <h3 id="how-to-get-tor-via-email">Nola eskuratu Tor eposta bidez</h3> - To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with windows in the body of the message. You can leave the subject blank. + Windowsentzako Ingelerazko Tor Browser Bundlea jasotzeko, bidali email bat gettor(a)torproject.org helbidera mezuaren gorputzean windows hitzarekin. Gaia hutsik utzi dezakezu. You can also request the Tor Browser Bundle for Mac OS X (write macos-i386), and Linux (write linux-i386 for 32-bit systems or linux-x86_64 for 64-bit systems). If you want a translated version of Tor, write help instead. You will then receive an email with instructions and a list of available languages. Note: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.

1 0