- tor-commits - lists.torproject.org

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

19 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

[tor/maint-0.2.2] Correct HS descriptor length check
by nickm＠torproject.org 19 Apr '11

19 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/master] Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
by nickm＠torproject.org 19 Apr '11

19 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/master] Correct the warning emitted when rejecting an oversized HS desc
by nickm＠torproject.org 19 Apr '11

19 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/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 19 Apr '11

19 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/master] Add an XXX
by nickm＠torproject.org 19 Apr '11

19 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/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 19 Apr '11

19 Apr '11

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

1 0

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

19 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/maint-0.2.2] Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
by nickm＠torproject.org 19 Apr '11

19 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/maint-0.2.2] Add an XXX
by nickm＠torproject.org 19 Apr '11

19 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