September 2011 - tor-commits - lists.torproject.org

[torspec/master] trivial whitespace fix
by arma＠torproject.org 20 Sep '11

20 Sep '11

commit 91905a79a67c01e571860597ab097285ba904217 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 20 11:01:49 2011 -0400 trivial whitespace fix --- tor-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 7d84dc9..7998946 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -164,7 +164,7 @@ see tor-design.pdf. In "certificates up-front", the connection initiator always sends a two-certificate chain, consisting of an X.509 certificate using a - short-term connection public key and a second, self- signed X.509 + short-term connection public key and a second, self-signed X.509 certificate containing its identity key. The other party sends a similar certificate chain. The initiator's ClientHello MUST NOT include any ciphersuites other than:

1 0

[torspec/master] fix two bugs in the signal section of control-spec
by arma＠torproject.org 20 Sep '11

20 Sep '11

commit d4b656274ed3cfaf610bdbbb7edf0e403465fde5 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 20 11:01:10 2011 -0400 fix two bugs in the signal section of control-spec first, a hup signal doesn't make us refetch directory information second, the 30-second controlled shutdown is actually a config option. --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 61c858a..e745a1f 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -348,10 +348,10 @@ The meaning of the signals are: - RELOAD -- Reload: reload config items, refetch directory. (like HUP) + RELOAD -- Reload: reload config items. (like HUP) SHUTDOWN -- Controlled shutdown: if server is an OP, exit immediately. - If it's an OR, close listeners and exit after 30 seconds. - (like INT) + If it's an OR, close listeners and exit after + ShutdownWaitLength seconds. (like INT) DUMP -- Dump stats: log information about open connections and circuits. (like USR1) DEBUG -- Debug: switch all open logs to loglevel debug. (like USR2)

1 0

[torspec/master] trivial fixes to prop 176
by arma＠torproject.org 20 Sep '11

20 Sep '11

commit 5ba6f2e3ed93007c573bcd22ca55cc9afa6ba29e Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 20 11:00:35 2011 -0400 trivial fixes to prop 176 --- proposals/176-revising-handshake.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/176-revising-handshake.txt b/proposals/176-revising-handshake.txt index 8ede6cb..39f4465 100644 --- a/proposals/176-revising-handshake.txt +++ b/proposals/176-revising-handshake.txt @@ -231,7 +231,7 @@ Supersedes: 169 accept v2 certificates. Fortunately, current certificates have a few characteristics that - make them fairly mannered as it is. We say that a certificate + make them fairly well-mannered as it is. We say that a certificate indicates a V2-only server if ALL of the following hold: * The certificate is not self-signed. * There is no DN field set in the certificate's issuer or @@ -280,7 +280,7 @@ Supersedes: 169 On learning the link protocol, the server then sends the client a CERT cell and a NETINFO cell. If the client wants to authenticate to the server, it sends a CERT cell, an AUTHENTICATE - cell, and a NETINFO cell, or it may simply send a NETINFO cell if + cell, and a NETINFO cell; or it may simply send a NETINFO cell if it does not want to authenticate. The CERT cell describes the keys that a Tor instance is claiming

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit 40288e1e66b82fc0a641afeaad5d102f001f3df1 Merge: 0c0345a bfa75f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 10:25:56 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4059 | 5 +++++ src/common/OpenBSD_malloc_Linux.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] changes file for bug 4059
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit bfa75f70bb5eef7b470068df8bf9e3c7fa88c21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 09:56:26 2011 -0400 changes file for bug 4059 --- changes/bug4059 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4059 b/changes/bug4059 new file mode 100644 index 0000000..82a4b1a --- /dev/null +++ b/changes/bug4059 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. +

1 0

[tor/master] Fix a potentially useless integer overflow check.
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit 1ba90ab655fab036f00ba0185ca7b456612a12bd Author: Mansour Moufid <mansourmoufid(a)gmail.com> Date: Mon Sep 19 21:25:23 2011 -0400 Fix a potentially useless integer overflow check. GCC 4.2 and maybe other compilers optimize away unsigned integer overflow checks of the form (foo + bar < foo), for all bar. Fix one such check in `src/common/OpenBSD_malloc_Linux.c'. --- src/common/OpenBSD_malloc_Linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 19dac77..445135c 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -1236,7 +1236,7 @@ imalloc(size_t size) ptralloc = 1; size = malloc_pagesize; } - if ((size + malloc_pagesize) < size) { /* Check for overflow */ + if (size > SIZE_MAX - malloc_pagesize) { /* Check for overflow */ result = NULL; errno = ENOMEM; } else if (size <= malloc_maxsize)

1 0

[tor/maint-0.2.2] changes file for bug 4059
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit bfa75f70bb5eef7b470068df8bf9e3c7fa88c21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 09:56:26 2011 -0400 changes file for bug 4059 --- changes/bug4059 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4059 b/changes/bug4059 new file mode 100644 index 0000000..82a4b1a --- /dev/null +++ b/changes/bug4059 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. +

1 0

[tor/maint-0.2.2] Fix a potentially useless integer overflow check.
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit 1ba90ab655fab036f00ba0185ca7b456612a12bd Author: Mansour Moufid <mansourmoufid(a)gmail.com> Date: Mon Sep 19 21:25:23 2011 -0400 Fix a potentially useless integer overflow check. GCC 4.2 and maybe other compilers optimize away unsigned integer overflow checks of the form (foo + bar < foo), for all bar. Fix one such check in `src/common/OpenBSD_malloc_Linux.c'. --- src/common/OpenBSD_malloc_Linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 19dac77..445135c 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -1236,7 +1236,7 @@ imalloc(size_t size) ptralloc = 1; size = malloc_pagesize; } - if ((size + malloc_pagesize) < size) { /* Check for overflow */ + if (size > SIZE_MAX - malloc_pagesize) { /* Check for overflow */ result = NULL; errno = ENOMEM; } else if (size <= malloc_maxsize)

1 0

r25088: {} Remove empty projects/puppettor.html page which has 6 transl (website/trunk/projects/en)
by Karsten Loesing 20 Sep '11

20 Sep '11

Author: kloesing Date: 2011-09-20 11:53:49 +0000 (Tue, 20 Sep 2011) New Revision: 25088 Removed: website/trunk/projects/en/puppettor.wml Log: Remove empty projects/puppettor.html page which has 6 translations Deleted: website/trunk/projects/en/puppettor.wml =================================================================== --- website/trunk/projects/en/puppettor.wml 2011-09-19 07:12:57 UTC (rev 25087) +++ website/trunk/projects/en/puppettor.wml 2011-09-20 11:53:49 UTC (rev 25088) @@ -1,26 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/projects>">Sample Project</a> - </div> - <div id="maincol"> - - <h1>Sample Tor Project</h1> - Here is some information - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi>

1 0

[arm/master] fix: tab completion could truncated results
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit 48e955db099c5295edcee19508844fbd812b5948 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:10:12 2011 -0700 fix: tab completion could truncated results When the tab completion matches had prefixes with multiple cases (for instance "MAPADDRESS" and "MapAddress") then tab completion would crop input to the common portion (just "M"). Instead picking the prefix with the largest set of results. This isn't perfect since it could hide some results but seems like the best option for getting around this stupid behavior. --- src/util/torInterpretor.py | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d5abb88..593f29c 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -348,6 +348,30 @@ class TorControlCompleter: if text != self._prefix: self._prefix = text self._prefixMatches = self.getMatches(text) + + # Tab completion fills in the first common prefix which can be + # problematic if they don't all match. For instance completing "Map" will + # result in ["MAPADDRESS", "MapAddress"], which gets truncated to the + # common prefix of just "M" when the user presses tab. + + if len(self._prefixMatches) > 1: + prefixToResult = {} + + for match in self._prefixMatches: + prefix = match[:len(text)] + + if prefix in prefixToResult: + prefixToResult[prefix].append(match) + else: + prefixToResult[prefix] = [match] + + if len(prefixToResult) > 1: + # we have multiple prefixes, pick the one with the most results + self._prefixMatches = None + + for matchSet in prefixToResult.values(): + if not self._prefixMatches or len(self._prefixMatches) < len(matchSet): + self._prefixMatches = matchSet if state < len(self._prefixMatches): return self._prefixMatches[state]

1 0