tor-commits

tor-commits@lists.torproject.org

1 participants
212442 discussions

[tor/master] Merge branch 'bug2752' into maint-0.2.2
by nickm＠torproject.org 17 May '11

17 May '11

commit bc89ef0ca8164f9e6e23e73c01bdb4257fdbce7c Merge: 21ed575 9674fe7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 19:51:53 2011 -0400 Merge branch 'bug2752' into maint-0.2.2 changes/bug2752 | 5 +++++ src/or/config.c | 8 ++++---- src/or/connection.c | 13 +++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.2.2] Fix bug2752 : 48-char HTTPProxyAuthenticator limitation
by nickm＠torproject.org 17 May '11

17 May '11

commit a3707a10529c3d90a06149cf0e4bcd28b7b1ab5b Author: Michael Yakubovich <e_zine99(a)yahoo.com> Date: Mon May 16 16:09:35 2011 -0400 Fix bug2752 : 48-char HTTPProxyAuthenticator limitation Bumped the char maximum to 512 for HTTPProxyAuthenticator & HTTPSProxyAuthenticator. Now stripping all '\n' after base64 encoding in alloc_http_authenticator. --- changes/bug2752 | 5 +++++ src/or/config.c | 8 ++++---- src/or/connection.c | 13 +++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/changes/bug2752 b/changes/bug2752 new file mode 100644 index 0000000..328f11e --- /dev/null +++ b/changes/bug2752 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Tor used to limit HttpProxyAuthenticator values to 48 characters. + Changed the limit to 512 characters by removing base64 newlines. + Fixes bug 2917. + diff --git a/src/or/config.c b/src/or/config.c index 614fc48..36a8940 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3398,8 +3398,8 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->HTTPProxyAuthenticator) { - if (strlen(options->HTTPProxyAuthenticator) >= 48) - REJECT("HTTPProxyAuthenticator is too long (>= 48 chars)."); + if (strlen(options->HTTPProxyAuthenticator) >= 512) + REJECT("HTTPProxyAuthenticator is too long (>= 512 chars)."); } if (options->HTTPSProxy) { /* parse it now */ @@ -3412,8 +3412,8 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->HTTPSProxyAuthenticator) { - if (strlen(options->HTTPSProxyAuthenticator) >= 48) - REJECT("HTTPSProxyAuthenticator is too long (>= 48 chars)."); + if (strlen(options->HTTPSProxyAuthenticator) >= 512) + REJECT("HTTPSProxyAuthenticator is too long (>= 512 chars)."); } if (options->Socks4Proxy) { /* parse it now */ diff --git a/src/or/connection.c b/src/or/connection.c index 5054909..bcdde67 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3232,8 +3232,17 @@ alloc_http_authenticator(const char *authenticator) authenticator, authenticator_length) < 0) { tor_free(base64_authenticator); /* free and set to null */ } else { - /* remove extra \n at end of encoding */ - base64_authenticator[strlen(base64_authenticator) - 1] = 0; + int i = 0, j = 0; + int len = strlen(base64_authenticator); + + /* remove all newline occurrences within the string */ + for (i=0; i < len; ++i) { + if ('\n' != base64_authenticator[i]) { + base64_authenticator[j] = base64_authenticator[i]; + ++j; + } + } + base64_authenticator[j]='\0'; } return base64_authenticator; }

1 0

[tor/maint-0.2.2] Add credit to bug2752; correct the issue number in the changes file
by nickm＠torproject.org 17 May '11

17 May '11

commit 9674fe7e2fdafdc7db7fac737c9e668b2a5e989a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 19:50:52 2011 -0400 Add credit to bug2752; correct the issue number in the changes file --- changes/bug2752 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug2752 b/changes/bug2752 index 328f11e..b872d33 100644 --- a/changes/bug2752 +++ b/changes/bug2752 @@ -1,5 +1,5 @@ - o Minor bugfixes + o Minor features: - Tor used to limit HttpProxyAuthenticator values to 48 characters. Changed the limit to 512 characters by removing base64 newlines. - Fixes bug 2917. + Fixes bug 2752. Fix by Michael Yakubovich.

1 0

[tor/maint-0.2.2] Merge branch 'bug2752' into maint-0.2.2
by nickm＠torproject.org 17 May '11

17 May '11

1 0

[tor/master] Check onion keys in microdescriptors, too
by nickm＠torproject.org 17 May '11

17 May '11

commit 480a75cbbd8067b32b2954303ca69401bfee58d9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 28 15:16:54 2011 -0700 Check onion keys in microdescriptors, too --- changes/bug3207 | 4 ++++ src/or/routerparse.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug3207 b/changes/bug3207 new file mode 100644 index 0000000..65a7dac --- /dev/null +++ b/changes/bug3207 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Require that onion keys have exponent 65537 in microdescriptors too. + Fixes part of bug 3207; bugfix on 0.2.2.25-alpha + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index be7a3fe..57436f7 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4336,6 +4336,11 @@ microdescs_parse_from_string(const char *s, const char *eos, } tok = find_by_keyword(tokens, K_ONION_KEY); + if (!crypto_pk_check_key_public_exponent(tok->key)) { + log_warn(LD_DIR, + "Relay's onion key had invalid exponent."); + goto next; + } md->onion_pkey = tok->key; tok->key = NULL;

1 0

[tor/master] Oops; that function got renamed.
by nickm＠torproject.org 17 May '11

17 May '11

commit 2e07925a5285fd50626e853c48ab5b79eec8e933 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 19:45:05 2011 -0400 Oops; that function got renamed. --- src/or/routerparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 57436f7..ce98a47 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4336,7 +4336,7 @@ microdescs_parse_from_string(const char *s, const char *eos, } tok = find_by_keyword(tokens, K_ONION_KEY); - if (!crypto_pk_check_key_public_exponent(tok->key)) { + if (!crypto_pk_public_exponent_ok(tok->key)) { log_warn(LD_DIR, "Relay's onion key had invalid exponent."); goto next;

1 0

[tor/master] Handle NULL argument to get_configured_bridge_by_addr_port_digest
by nickm＠torproject.org 17 May '11

17 May '11

commit 21ed575826e701437f7893536ffc5c8d2a71532f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 19:46:47 2011 -0400 Handle NULL argument to get_configured_bridge_by_addr_port_digest Fixes bug 2313; bugfix on 0.2.2.26-beta. --- changes/bug3213 | 4 ++++ src/or/circuitbuild.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug3213 b/changes/bug3213 new file mode 100644 index 0000000..ab7de2d --- /dev/null +++ b/changes/bug3213 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix a crash bug when changing bridges in a running Tor process. + Fixes bug 3213; bugfix on 0.2.2.26-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 860cd27..2f86e1f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4539,7 +4539,7 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, !tor_addr_compare(&bridge->addr, addr, CMP_EXACT) && bridge->port == port) return bridge; - if (tor_memeq(bridge->identity, digest, DIGEST_LEN)) + if (digest && tor_memeq(bridge->identity, digest, DIGEST_LEN)) return bridge; } SMARTLIST_FOREACH_END(bridge);

1 0

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

17 May '11

commit e0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be Merge: 4082d67 21ed575 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 19:47:48 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3207 | 4 ++++ changes/bug3213 | 4 ++++ src/or/circuitbuild.c | 2 +- src/or/routerparse.c | 5 +++++ 4 files changed, 14 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Handle NULL argument to get_configured_bridge_by_addr_port_digest
by nickm＠torproject.org 17 May '11

17 May '11

1 0

[tor/maint-0.2.2] Oops; that function got renamed.
by nickm＠torproject.org 17 May '11

17 May '11

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits