- tor-commits - lists.torproject.org

[tor/release-0.2.2] Add an XXX
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit adc31001c2f9923f8fcee2141d233200c95373cf Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 18 13:25:48 2011 -0700 Add an XXX --- src/or/routerparse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ecaf0..3d73f8d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3628,6 +3628,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, eos = eos + 1; /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { + /* XXX023 If we are parsing this descriptor as a server, this + * should be a protocol warning. */ log_warn(LD_REND, "Descriptor length is %i which exceeds " "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE);

1 0

[tor/release-0.2.2] Correct HS descriptor length check
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit 48bdc2f729cba1a22305f6150d230cf0334ebd55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 18 13:53:13 2011 -0700 Correct HS descriptor length check Fixes bug 2948. --- changes/bug2948 | 7 +++++++ src/or/routerparse.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug2948 b/changes/bug2948 new file mode 100644 index 0000000..640ef62 --- /dev/null +++ b/changes/bug2948 @@ -0,0 +1,7 @@ + o Minor bugfixes + - Only limit the lengths of single HS descriptors, even when + multiple HS descriptors are published to an HSDir relay in a + single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. + Found by hsdir. + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 8456a0a..dd72eb6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4638,12 +4638,12 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, else eos = eos + 1; /* Check length. */ - if (strlen(desc) > REND_DESC_MAX_SIZE) { + if (eos-desc > REND_DESC_MAX_SIZE) { /* XXX023 If we are parsing this descriptor as a server, this * should be a protocol warning. */ log_warn(LD_REND, "Descriptor length is %i which exceeds " "maximum rendezvous descriptor size of %i bytes.", - (int)strlen(desc), REND_DESC_MAX_SIZE); + (int)(eos-desc), REND_DESC_MAX_SIZE); goto err; } /* Tokenize descriptor. */

1 0

[tor/release-0.2.2] Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit cfd7b118a700f8dba53915118b1be4ac267db23b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:29:20 2011 -0400 Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) --- src/or/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 51c1b0f..b56d496 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,19 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > micro-revision.tmp; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE:

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit bc532bb13ff158f4c61ce04c7fd2bd0401ebe5a9 Merge: 4cbbb92 cfd7b11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:11 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d Merge: cfd7b11 adc3100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:30:50 2011 -0400 Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1 changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Standardize our printf code on %d, not %i.
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit 5cc322e5472996fda6095e54de302c0f5c68ea92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:40:26 2011 -0400 Standardize our printf code on %d, not %i. --- src/common/address.c | 2 +- src/or/routerparse.c | 4 ++-- src/test/test_addr.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index adc0ef0..aff517c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -604,7 +604,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out, if (family == AF_INET6 && v4map) { if (bits > 32 && bits < 96) { /* Crazy */ log_warn(LD_GENERAL, - "Bad mask bits %i for V4-mapped V6 address; rejecting.", + "Bad mask bits %d for V4-mapped V6 address; rejecting.", bits); goto err; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index dd72eb6..ba29f05 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4641,8 +4641,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, if (eos-desc > REND_DESC_MAX_SIZE) { /* XXX023 If we are parsing this descriptor as a server, this * should be a protocol warning. */ - log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i bytes.", + log_warn(LD_REND, "Descriptor length is %d which exceeds " + "maximum rendezvous descriptor size of %d bytes.", (int)(eos-desc), REND_DESC_MAX_SIZE); goto err; } diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 20ffaa0..6db4ee2 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -477,9 +477,9 @@ test_addr_ip6_helpers(void) i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2); #if 0 tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf)); - printf("\nv4 address: %s (family=%i)", buf, IN_FAMILY(&t1)); + printf("\nv4 address: %s (family=%d)", buf, IN_FAMILY(&t1)); tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf)); - printf("\nv6 address: %s (family=%i)", buf, IN_FAMILY(&t2)); + printf("\nv6 address: %s (family=%d)", buf, IN_FAMILY(&t2)); #endif done:

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit 0e554f93d677fefc649d103ed08ba298c27b3fed Merge: bc532bb dfc9c6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:31:42 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit 177cadff8d4ca01aad21abea44c7ecc0731525d6 Merge: 0e554f9 48bdc2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:36:49 2011 -0400 Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2 changes/bug2948 | 7 +++++++ src/or/routerparse.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

r24663: {} add the uppsala presentation and related images. (in projects/presentations: . images)
by Andrew Lewman 20 Apr '11

20 Apr '11

Author: phobos Date: 2011-04-20 21:01:06 +0000 (Wed, 20 Apr 2011) New Revision: 24663 Added: projects/presentations/2011-04-20-uppsala-panel.pdf projects/presentations/2011-04-20-uppsala-panel.tex projects/presentations/images/NRLEmblem.jpg projects/presentations/images/TieredInternet.jpg projects/presentations/images/UniversalEurope.jpg projects/presentations/images/bridge-users-2011-04-17-300-ir-2010-10-01.png projects/presentations/images/direct-users-2011-04-16-300-ir-2010-10-01.png projects/presentations/images/direct-users-2011-04-19-300-eg-2010-10-01.png projects/presentations/images/direct-users-2011-04-19-300-ir-2010-10-01.png projects/presentations/images/direct-users-2011-04-19-300-ly-2010-10-01.png projects/presentations/images/direct-users-2011-04-19-300-tn-2010-10-01.png projects/presentations/images/direct-users-2011-04-19-300-ye-2010-10-01.png projects/presentations/images/egypt.jpg projects/presentations/images/hands-seeds-child.jpg projects/presentations/images/procera-evolved-dpi.png Log: add the uppsala presentation and related images. Added: projects/presentations/2011-04-20-uppsala-panel.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-04-20-uppsala-panel.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2011-04-20-uppsala-panel.tex =================================================================== --- projects/presentations/2011-04-20-uppsala-panel.tex (rev 0) +++ projects/presentations/2011-04-20-uppsala-panel.tex 2011-04-20 21:01:06 UTC (rev 24663) @@ -0,0 +1,170 @@ +\documentclass{beamer} +\mode<presentation> +\usetheme{Boadilla} +\title{Technology, Dissent, and Authoritarianism} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{20 April 2011} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{The Promise of the Internet Yesterday} +\begin{itemize} +\item Dumb Network +\pause \item Unfettered communications +\pause \item User traffic is most important +\pause \item Users have access to a wide open, uncontrolled Internet +\pause \item The best networks should win the most customers +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{The Reality of the Internet Today} +\begin{itemize} +\pause \item Value-add services by telecom providers +\begin{itemize} +\item video streaming +\item image hosting +\item shared wifi access +\end{itemize} +\pause \item Tiered access (charge by protocols) +\pause \item Constrained access (charge by byte) +\pause \item Gaming (want lower latency? pay more) +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Git'yer internet here!} +\begin{center} +\includegraphics[scale=0.3]{./images/TieredInternet} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Mobile Internet} +\begin{center} +\includegraphics[scale=0.4]{./images/UniversalEurope} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Resisting Internet Censorship} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad The Net interprets censorship as damage and routes around it. +\end{quotation} +\flushright --- John Gilmore, 1993 +\flushleft +\pause \item No longer true on a technical level: censorship is in the routers. +\medskip +\pause \item Remains true on a social level: when material is censored, people distribute copies and draw attention to them +\medskip +\pause \item But what if people are too afraid to do this? +\end{frame} + +\begin{frame} +\frametitle{Censorship is in the routers} +\includegraphics[scale=0.6]{./images/procera-evolved-dpi} +\end{frame} + +\begin{frame} +\frametitle{Internet surveillance is pervasive} +\begin{columns}[t] +\column{7cm} +\begin{itemize} +\item Conventional surveillance methods had to be targeted +\item Internet censorship is capable of monitoring everyone, all of the time +\item Governments are increasing monitoring: SORM (Russia), Golden Shield (China), and Interception Modernisation Programme (UK) +\item 1 in 7 East German citizens worked for the Stasi. Today we can achieve the same results with a fraction of the cost +\end{itemize} +\column{5cm} +\vbox{} +\parbox{5cm}{\includegraphics[width=4.5cm]{./images/nsa-room}} +\end{columns} +\end{frame} + +\begin{frame} +\frametitle{Traffic data surveillance} +\begin{itemize} +\item Traffic data (who talks to whom, how often and for how long) is the core of intelligence capabilities +\item This information is cheaper to record and store, compared to full content +\item Because it can be easily processed by computer, data mining techniques can be used to understand social structures +\end{itemize} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad No government of any colour is to be trusted with such a roadmap to our souls +\end{quotation} +\flushright --- Sir Ken Macdonald, former director of public prosecutions, on the UK Interception Modernisation Program +\end{frame} + + +\begin{frame} +\frametitle{Importantly, information on social networks can be derived} +\begin{columns}[t] +\column{4.5cm} +\vspace{0cm} +{\color{red}$\bullet$} Communities\newline +{\color{blue}$\bullet$} People +\column{7cm} +\vbox{} +\includegraphics[clip, trim=5cm 12cm 2cm 5cm,width=7cm]{./images/network} +\end{columns} +\flushright{\tiny From ``The Economics of Mass Surveillance'' by George Danezis and Bettina Wittneben} +\end{frame} + +\begin{frame} +\frametitle{Lawful Intercept} +Lawful Interception (LI) describes the lawfully authorized interception +and monitoring of telecommunications pursuant to an order of a +government body, to obtain the forensics necessary for pursuing +wrongdoers. LI has existed from the times of shortrange telegraphy to +today’s worldspanning Next-Generation Networks (NGNs). +\end{frame} + +\begin{frame} +\frametitle{Backdoor} +A back door describes a way to access a computer system or network that +bypasses all security mechanisms. Anyone with knowledge of this +backdoor can control all access and surveil all communications +transmitting across the system. +\end{frame} + +\begin{frame} +\frametitle{Meanwhile.....} +\includegraphics[scale=0.5]{./images/egypt} +\end{frame} + +\begin{frame} +\frametitle{Tor usage in volatile times} +\includegraphics<1>[scale=0.6]{./images/direct-users-2011-04-19-300-eg-2010-10-01} +\includegraphics<2>[scale=0.6]{./images/direct-users-2011-04-19-300-ly-2010-10-01} +\includegraphics<3>[scale=0.6]{./images/direct-users-2011-04-19-300-tn-2010-10-01} +\includegraphics<4>[scale=0.6]{./images/direct-users-2011-04-19-300-ir-2010-10-01} +\includegraphics<5>[scale=0.6]{./images/direct-users-2011-04-19-300-ye-2010-10-01} +\end{frame} + +\begin{frame} +\frametitle{Consequences} +\begin{itemize} +\item Ongoing Libyan civil war +\pause \item Syrian protests violent crackdown +\pause \item 100 Bahrainian protestors dead +\pause \item Continued Iranian constraint of...everything +\pause \item Saudi Arabian crackdown on all protests and organizing +\pause \item Tunisia still developing a government +\pause \item Egypt still developing a government +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{The seed is planted} +\begin{center} +\includegraphics[scale=0.3]{./images/hands-seeds-child} +\end{center} +\end{frame} + +\end{document} Property changes on: projects/presentations/2011-04-20-uppsala-panel.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/NRLEmblem.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/NRLEmblem.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/TieredInternet.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/TieredInternet.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/UniversalEurope.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/UniversalEurope.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/bridge-users-2011-04-17-300-ir-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/bridge-users-2011-04-17-300-ir-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-16-300-ir-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-16-300-ir-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-19-300-eg-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-19-300-eg-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-19-300-ir-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-19-300-ir-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-19-300-ly-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-19-300-ly-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-19-300-tn-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-19-300-tn-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-04-19-300-ye-2010-10-01.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-04-19-300-ye-2010-10-01.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/egypt.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/egypt.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/hands-seeds-child.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/hands-seeds-child.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/procera-evolved-dpi.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/procera-evolved-dpi.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[torspec/master] Move a misplaced parenthesis
by nickm＠torproject.org 20 Apr '11

20 Apr '11

commit 49b179585a33822469fa7ec94e4184ae29e6deb8 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Apr 19 17:16:02 2011 -0700 Move a misplaced parenthesis --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d24afab..5878d75 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -863,7 +863,7 @@ InfoLine = AuthLine / VersionLine / OtherLine - AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *(",")AuthMethod + AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *("," AuthMethod) *(SP "COOKIEFILE=" AuthCookieFile) CRLF VersionLine = "250-VERSION" SP "Tor=" TorVersion [SP Arguments] CRLF

1 0