- tor-commits - lists.torproject.org

[tor/release-0.2.2] Changes file for bug2355.
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit b79d50dfcc77013329b2fbfd4a84af29a5965b27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:49:16 2011 -0400 Changes file for bug2355. --- changes/bug2355 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug2355 b/changes/bug2355 new file mode 100644 index 0000000..ee0ae4b --- /dev/null +++ b/changes/bug2355 @@ -0,0 +1,8 @@ + o Major features: + - If "UseBridges 1" is set and no bridges are configured, Tor will + now refuse to build any circuits until some bridges are set. + If "UseBridges auto" is set, Tor will use bridges if they are + configured and we are not running as a server, but otherwise + will make circuits as usual. The new default is "auto". Patch + by anonym. +

1 0

[tor/release-0.2.2] Remove dead code from rend_cache_lookup_v2_desc_as_dir
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit c90097e74a21ef70d9df2ab70e5b211d7a26dc6d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Mar 13 21:10:32 2011 -0700 Remove dead code from rend_cache_lookup_v2_desc_as_dir hid_serv_responsible_for_desc_id's return value is never negative, and there is no need to search through the consensus to find out whether we are responsible for a descriptor ID before we look in our cache for a descriptor. --- changes/bug2748 | 5 +++++ src/or/rendcommon.c | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/changes/bug2748 b/changes/bug2748 new file mode 100644 index 0000000..647000d --- /dev/null +++ b/changes/bug2748 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes + part of bug 2748; bugfix on 0.2.0.10-alpha. + + diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index d6f5443..ff3a401 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1008,13 +1008,6 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) safe_str(desc_id)); return -1; } - /* Determine if we are responsible. */ - if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) { - log_info(LD_REND, "Could not answer fetch request for v2 descriptor; " - "either we are no hidden service directory, or we are " - "not responsible for the requested ID."); - return -1; - } /* Lookup descriptor and return. */ e = digestmap_get(rend_cache_v2_dir, desc_id_digest); if (e) {

1 0

[tor/release-0.2.2] Log malformed HS descriptor requests at the proper level
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 96b929e743dc68f706f374c3448ed27c54a9cead Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 14 01:11:30 2011 -0700 Log malformed HS descriptor requests at the proper level This log message should be a 'protocol warning', not a 'warning'. --- changes/bug2748 | 5 +++++ src/or/rendcommon.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug2748 b/changes/bug2748 index 647000d..b522560 100644 --- a/changes/bug2748 +++ b/changes/bug2748 @@ -1,5 +1,10 @@ o Minor bugfixes - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes part of bug 2748; bugfix on 0.2.0.10-alpha. + - Log malformed requests for rendezvous descriptors as protocol + warnings, not warnings. Also, use a more informative log + message in case someone sees it at log level warning without + prior info-level messages. Fixes the other part of bug 2748; + bugfix on 0.2.0.10-alpha. diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index ff3a401..9acc641 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1004,8 +1004,10 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) tor_assert(rend_cache_v2_dir); if (base32_decode(desc_id_digest, DIGEST_LEN, desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) { - log_warn(LD_REND, "Descriptor ID contains illegal characters: %s", - safe_str(desc_id)); + log_fn(LOG_PROTOCOL_WARN, LD_REND, + "Rejecting v2 rendezvous descriptor request -- descriptor ID " + "contains illegal characters: %s", + safe_str(desc_id)); return -1; } /* Lookup descriptor and return. */

1 0

[tor/release-0.2.2] stop asserting at boot
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 56771f392e68eb2f78180daab0d8f17c9284ad11 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 23:50:37 2011 -0400 stop asserting at boot The patch for 3228 made us try to run init_keys() before we had loaded our state file, resulting in an assert inside init_keys. We had moved it too early in the function. Now it's later in the function, but still above the accounting calls. --- src/or/config.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f97e9b1..6635cac 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1180,18 +1180,6 @@ options_act(or_options_t *old_options) return -1; } - /* We want to reinit keys as needed before we do much of anything else: - keys are important, and other things can depend on them. */ - if (running_tor && - (transition_affects_workers || - (options->V3AuthoritativeDir && (!old_options || - !old_options->V3AuthoritativeDir)))) { - if (init_keys() < 0) { - log_warn(LD_BUG,"Error initializing keys; exiting"); - return -1; - } - } - if (consider_adding_dir_authorities(options, old_options) < 0) return -1; @@ -1237,6 +1225,17 @@ options_act(or_options_t *old_options) finish_daemon(options->DataDirectory); } + /* We want to reinit keys as needed before we do much of anything else: + keys are important, and other things can depend on them. */ + if (transition_affects_workers || + (options->V3AuthoritativeDir && (!old_options || + !old_options->V3AuthoritativeDir))) { + if (init_keys() < 0) { + log_warn(LD_BUG,"Error initializing keys; exiting"); + return -1; + } + } + /* Write our PID to the PID file. If we do not have write permissions we * will log a warning */ if (options->PidFile)

1 0

[tor/release-0.2.2] fix a bridge edge case similar to 2511
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 7039c34519e29a18081a9bc7f3c957c473c70bc4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 31 20:43:55 2011 -0400 fix a bridge edge case similar to 2511 If you had configured a bridge but then switched to a different bridge via the controller, you would still be willing to use the old one. --- changes/bug3321 | 7 +++++++ src/or/circuitbuild.c | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug3321 b/changes/bug3321 new file mode 100644 index 0000000..3605efc --- /dev/null +++ b/changes/bug3321 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - In bug 2511 we fixed a case where you could use an unconfigured + bridge if you had configured it as a bridge the last time you ran + Tor. Now fix another edge case: if you had configured it as a bridge + but then switched to a different bridge via the controller, you + would still be willing to use the old one. Bugfix on 0.2.0.1-alpha; + fixes bug 3321. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2f70b67..3f08448 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3383,6 +3383,8 @@ entry_guard_set_status(entry_guard_t *e, routerinfo_t *ri, *reason = "down"; else if (options->UseBridges && ri->purpose != ROUTER_PURPOSE_BRIDGE) *reason = "not a bridge"; + else if (options->UseBridges && !routerinfo_is_a_configured_bridge(ri)) + *reason = "not a configured bridge"; else if (!options->UseBridges && !ri->is_possible_guard && !routerset_contains_router(options->EntryNodes,ri)) *reason = "not recommended as a guard"; @@ -3467,11 +3469,16 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, *msg = "no descriptor"; return NULL; } - if (get_options()->UseBridges && r->purpose != ROUTER_PURPOSE_BRIDGE) { - *msg = "not a bridge"; - return NULL; - } - if (!get_options()->UseBridges && r->purpose != ROUTER_PURPOSE_GENERAL) { + if (options->UseBridges) { + if (r->purpose != ROUTER_PURPOSE_BRIDGE) { + *msg = "not a bridge"; + return NULL; + } + if (!routerinfo_is_a_configured_bridge(r)) { + *msg = "not a configured bridge"; + return NULL; + } + } else if (r->purpose != ROUTER_PURPOSE_GENERAL) { *msg = "not general-purpose"; return NULL; }

1 0

[tor/master] Reject 128-byte keys that are not 1024-bit
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit bbf2fee8ff7bbb8f645b7d973cd84bc97e93ae54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 12:32:59 2011 -0400 Reject 128-byte keys that are not 1024-bit When we added the check for key size, we required that the keys be 128 bytes. But RSA_size (which defers to BN_num_bytes) will return 128 for keys of length 1017..1024. This patch adds a new crypto_pk_num_bits() that returns the actual number of significant bits in the modulus, and uses that to enforce key sizes. Also, credit the original bug3318 in the changes file. --- changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug3318 b/changes/bug3318 index 38991c4..8a3c278 100644 --- a/changes/bug3318 +++ b/changes/bug3318 @@ -1,3 +1,7 @@ o Minor bugfixes: - Fix a log message that said "bits" while displaying a value in - bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha. + bytes. Found by wanoskarnet. Fixes bug 3318; bugfix on + 0.2.0.1-alpha. + - When checking for 1024-bit keys, check for 1024 bits, not 128 + bytes. This allows Tor to correctly discard keys of length + 1017 through 1023. Bugfix on 0.0.9pre5. diff --git a/src/common/crypto.c b/src/common/crypto.c index 1ecc24c..d8e6619 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -777,6 +777,17 @@ crypto_pk_keysize(crypto_pk_env_t *env) return (size_t) RSA_size(env->key); } +/** Return the size of the public key modulus of env, in bits. */ +int +crypto_pk_num_bits(crypto_pk_env_t *env) +{ + tor_assert(env); + tor_assert(env->key); + tor_assert(env->key->n); + + return BN_num_bits(env->key->n); +} + /** Increase the reference count of env, and return it. */ crypto_pk_env_t * diff --git a/src/common/crypto.h b/src/common/crypto.h index 54c7a67..1a8c81f 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -119,6 +119,7 @@ int crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env, int crypto_pk_check_key(crypto_pk_env_t *env); int crypto_pk_cmp_keys(crypto_pk_env_t *a, crypto_pk_env_t *b); size_t crypto_pk_keysize(crypto_pk_env_t *env); +int crypto_pk_num_bits(crypto_pk_env_t *env); crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig); crypto_pk_env_t *crypto_pk_copy_full(crypto_pk_env_t *orig); int crypto_pk_key_is_private(const crypto_pk_env_t *key); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3728e99..f855f9d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3765,9 +3765,9 @@ token_check_object(memarea_t *area, const char *kwd, break; case NEED_KEY_1024: /* There must be a 1024-bit public key. */ case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ - if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { + if (tok->key && crypto_pk_num_bits(tok->key) != PK_BYTES*8) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)*8); + kwd, crypto_pk_num_bits(tok->key)); RET_ERR(ebuf); } /* fall through */ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index bf2cc48..121af27 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -343,7 +343,9 @@ test_crypto_pk(void) test_eq(0, crypto_pk_cmp_keys(pk1, pk2)); test_eq(128, crypto_pk_keysize(pk1)); + test_eq(1024, crypto_pk_num_bits(pk1)); test_eq(128, crypto_pk_keysize(pk2)); + test_eq(1024, crypto_pk_num_bits(pk2)); test_eq(128, crypto_pk_public_encrypt(pk2, data1, sizeof(data1), "Hello whirled.", 15,

1 0

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

03 Jun '11

commit 12f9c91c06edf09d8acf40b08aece22b77258dbc Merge: 50e4c98 7aa20b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:36:21 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'bug3318c' into maint-0.2.2
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 7aa20b20bffcbc4c9b4e3eb1c874616e1cab119f Merge: de069f5 bbf2fee Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:34:32 2011 -0400 Merge branch 'bug3318c' into maint-0.2.2 changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Reject 128-byte keys that are not 1024-bit
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit bbf2fee8ff7bbb8f645b7d973cd84bc97e93ae54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 12:32:59 2011 -0400 Reject 128-byte keys that are not 1024-bit When we added the check for key size, we required that the keys be 128 bytes. But RSA_size (which defers to BN_num_bytes) will return 128 for keys of length 1017..1024. This patch adds a new crypto_pk_num_bits() that returns the actual number of significant bits in the modulus, and uses that to enforce key sizes. Also, credit the original bug3318 in the changes file. --- changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug3318 b/changes/bug3318 index 38991c4..8a3c278 100644 --- a/changes/bug3318 +++ b/changes/bug3318 @@ -1,3 +1,7 @@ o Minor bugfixes: - Fix a log message that said "bits" while displaying a value in - bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha. + bytes. Found by wanoskarnet. Fixes bug 3318; bugfix on + 0.2.0.1-alpha. + - When checking for 1024-bit keys, check for 1024 bits, not 128 + bytes. This allows Tor to correctly discard keys of length + 1017 through 1023. Bugfix on 0.0.9pre5. diff --git a/src/common/crypto.c b/src/common/crypto.c index 1ecc24c..d8e6619 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -777,6 +777,17 @@ crypto_pk_keysize(crypto_pk_env_t *env) return (size_t) RSA_size(env->key); } +/** Return the size of the public key modulus of env, in bits. */ +int +crypto_pk_num_bits(crypto_pk_env_t *env) +{ + tor_assert(env); + tor_assert(env->key); + tor_assert(env->key->n); + + return BN_num_bits(env->key->n); +} + /** Increase the reference count of env, and return it. */ crypto_pk_env_t * diff --git a/src/common/crypto.h b/src/common/crypto.h index 54c7a67..1a8c81f 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -119,6 +119,7 @@ int crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env, int crypto_pk_check_key(crypto_pk_env_t *env); int crypto_pk_cmp_keys(crypto_pk_env_t *a, crypto_pk_env_t *b); size_t crypto_pk_keysize(crypto_pk_env_t *env); +int crypto_pk_num_bits(crypto_pk_env_t *env); crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig); crypto_pk_env_t *crypto_pk_copy_full(crypto_pk_env_t *orig); int crypto_pk_key_is_private(const crypto_pk_env_t *key); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3728e99..f855f9d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3765,9 +3765,9 @@ token_check_object(memarea_t *area, const char *kwd, break; case NEED_KEY_1024: /* There must be a 1024-bit public key. */ case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ - if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { + if (tok->key && crypto_pk_num_bits(tok->key) != PK_BYTES*8) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)*8); + kwd, crypto_pk_num_bits(tok->key)); RET_ERR(ebuf); } /* fall through */ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index bf2cc48..121af27 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -343,7 +343,9 @@ test_crypto_pk(void) test_eq(0, crypto_pk_cmp_keys(pk1, pk2)); test_eq(128, crypto_pk_keysize(pk1)); + test_eq(1024, crypto_pk_num_bits(pk1)); test_eq(128, crypto_pk_keysize(pk2)); + test_eq(1024, crypto_pk_num_bits(pk2)); test_eq(128, crypto_pk_public_encrypt(pk2, data1, sizeof(data1), "Hello whirled.", 15,

1 0

[tor/maint-0.2.2] Merge branch 'bug3318c' into maint-0.2.2
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 7aa20b20bffcbc4c9b4e3eb1c874616e1cab119f Merge: de069f5 bbf2fee Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:34:32 2011 -0400 Merge branch 'bug3318c' into maint-0.2.2 changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-)

1 0