- tor-commits - lists.torproject.org

[tor/maint-0.2.2] 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/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

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/maint-0.2.2] 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/maint-0.2.2] 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

r24767: {website} Update version-alpha string to 0.2.2.26-beta (website/trunk/include)
by Sebastian Hahn 17 May '11

17 May '11

Author: sebastian Date: 2011-05-17 22:47:52 +0000 (Tue, 17 May 2011) New Revision: 24767 Modified: website/trunk/include/versions.wmi Log: Update version-alpha string to 0.2.2.26-beta Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-05-17 15:29:45 UTC (rev 24766) +++ website/trunk/include/versions.wmi 2011-05-17 22:47:52 UTC (rev 24767) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.26-beta</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.25-alpha</define-tag>

1 0

[torspec/master] It's 0.2.2.26-beta, not -alpha.
by nickm＠torproject.org 17 May '11

17 May '11

commit 731705f03aaa47d4780cc88f3491c08d0ce3641b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 18:10:34 2011 -0400 It's 0.2.2.26-beta, not -alpha. --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 162ac70..00bfbfe 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -639,7 +639,7 @@ "net/listeners/dns" "net/listeners/control" A space-separated list of the addresses at which Tor is listening for - connections of each specified type. [New in Tor 0.2.2.26-alpha.] + connections of each specified type. [New in Tor 0.2.2.26-beta.] Examples: C: GETINFO version desc/name/moria1

1 0