- tor-commits - lists.torproject.org

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

20 Apr '11

commit caa44c9c763d2af41e2627d5c94aa1d31d63f552 Merge: 4747c84 3f7f96d Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 20 19:58:30 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug2704_part1 | 5 +++++ changes/bug2704_part2 | 5 +++++ changes/bug2750 | 6 ++++++ changes/bug2948 | 7 +++++++ src/common/address.c | 2 +- src/or/rephist.c | 21 +++++++++++++++++---- src/or/routerparse.c | 10 ++++++---- src/test/test_addr.c | 4 ++-- 8 files changed, 49 insertions(+), 11 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'bug2750-v3' into bug2948
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit 130db1bdebb7089d78db6d3e0f7497ac5ee71f73 Merge: 4cbbb92 adc3100 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 18 13:36:19 2011 -0700 Merge branch 'bug2750-v3' into bug2948 changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Correct the warning emitted when rejecting an oversized HS desc
by arma＠torproject.org 20 Apr '11

20 Apr '11

commit bfebc942eaf7098e8d35f1de9159da450d5e3969 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 02:26:07 2011 -0700 Correct the warning emitted when rejecting an oversized HS desc --- changes/bug2750 | 6 ++++++ src/or/routerparse.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug2750 b/changes/bug2750 new file mode 100644 index 0000000..4371a0a --- /dev/null +++ b/changes/bug2750 @@ -0,0 +1,6 @@ + o Minor bugfixes + - Correct the warning displayed when a rendezvous descriptor exceeds + the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found + by John Brooks. + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1faa177..28ecaf0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3629,7 +3629,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i kilobytes.", + "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE); goto err; }

1 0

[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