- tor-commits - lists.torproject.org

[tor/release-0.2.1] fold in changes files for 0.2.1.31
by arma＠torproject.org 11 May '11

11 May '11

commit b36a837f0812097346094e7af1e965b1fd522bbf Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 10 22:36:29 2011 -0400 fold in changes files for 0.2.1.31 --- ChangeLog | 46 +++++++++++++++++++++++++++++++++++ changes/all_descs | 4 --- changes/bug1172 | 9 ------- changes/bug2402_redux | 6 ---- changes/bug2475 | 5 ---- changes/bug2629 | 5 ---- changes/bug2750 | 6 ---- changes/bug2933 | 4 --- changes/forget-rend-descs-on-newnym | 9 ------- changes/geoip-apr2011 | 3 -- changes/geoip-mar2011 | 3 -- changes/ipv6_crash | 4 --- changes/zlib_aint_openssl | 3 -- 13 files changed, 46 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index beb2dff..a2f00d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +Changes in version 0.2.1.31 - 2011-05-?? + o Major bugfixes (also included in 0.2.2.x): + - Avoid linkability based on cached hidden service descriptors: forget + all hidden service descriptors cached as a client when processing a + SIGNAL NEWNYM command. Fixes bug 3000; bugfix on 0.0.6. + - Make the bridge directory authority refuse to answer directory + requests for "all" descriptors. It used to include bridge + descriptors in its answer, which was a major information leak. + Found by "piebeer". Bugfix on 0.2.0.3-alpha. + - Fix an assert in parsing router descriptors containing IPv6 + addresses. This one took down the directory authorities when + somebody tried some experimental code. Bugfix on 0.2.1.3-alpha. + + o Minor bugfixes (also included in 0.2.2.x): + - When we restart our relay, we might get a successful connection + from the outside before we've started our reachability tests, + triggering a warning: "ORPort found reachable, but I have no + routerinfo yet. Failing to inform controller of success." This + bug was harmless unless Tor is running under a controller + like Vidalia, in which case the controller would never get a + REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha; + fixes bug 1172. + - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. + None of the cases where we did this before were wrong, but by making + this change we avoid warnings. Fixes bug 2475; bugfix on 0.2.1.28. + - Fix a rare crash bug that could occur when a client was configured + with a large number of bridges. Fixes bug 2629; bugfix on + 0.2.1.2-alpha. Bugfix by trac user "shitlei". + - 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. + - Fix an uncommon assertion failure when running with DNSPort under + heavy load. Fixes bug 2933; bugfix on 0.2.0.1-alpha. + - When warning about missing zlib development packages during compile, + give the correct package names. Bugfix on 0.2.0.1-alpha. + + o Minor bugfixes (only in 0.2.1.x): + - Resume using micro-version numbers in 0.2.1.x: our Debian packages + rely on them. Bugfix on 0.2.1.30. + - Use git revisions instead of svn revisions when generating our + micro-version numbers. Bugfix on 0.2.1.15-rc; fixes bug 2402. + + o Minor features: + - Update to the April 1 2011 Maxmind GeoLite Country database. + + Changes in version 0.2.1.30 - 2011-02-23 Tor 0.2.1.30 fixes a variety of less critical bugs. The main other change is a slight tweak to Tor's TLS handshake that makes relays diff --git a/changes/all_descs b/changes/all_descs deleted file mode 100644 index 10711b2..0000000 --- a/changes/all_descs +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (bridge authority) - - Do not allow encrypte requests for "all" bridges to return all - bridges. - diff --git a/changes/bug1172 b/changes/bug1172 deleted file mode 100644 index 3abd743..0000000 --- a/changes/bug1172 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - When we restart our relay, we might get a successful connection - from the outside before we've started our reachability tests, - triggering a warning: "ORPort found reachable, but I have no - routerinfo yet. Failing to inform controller of success." This - bug was harmless unless Tor is running under a controller - like Vidalia, in which case the controller would never get a - REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha; - fixes bug 1172. diff --git a/changes/bug2402_redux b/changes/bug2402_redux deleted file mode 100644 index 84be04a..0000000 --- a/changes/bug2402_redux +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - Use micro-revision numbers in 0.2.1.x instead: apparently, they - were more used than we had known. (Bugfix on 0.2.1.30). - - Instead of generating our micro-version numbers using SVN revisions, - use git revisions instead. Bugfix on 0.2.1.15-rc; fixes bug 2402. - diff --git a/changes/bug2475 b/changes/bug2475 deleted file mode 100644 index d6f0595..0000000 --- a/changes/bug2475 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. - (None of the cases where we did this before were wrong, but by making - this change we can avoid warnings.) Fixes bug2475; bugfix on - Tor 0.2.1.28. diff --git a/changes/bug2629 b/changes/bug2629 deleted file mode 100644 index 87817cf..0000000 --- a/changes/bug2629 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes - - Fix a crash bug that could occur occasionally when a client was - configured with a large number of bridges. Fixes bug 2629; bugfix - on 0.2.1.2-alpha. Bugfix by trac user "shitlei". - diff --git a/changes/bug2750 b/changes/bug2750 deleted file mode 100644 index 4371a0a..0000000 --- a/changes/bug2750 +++ /dev/null @@ -1,6 +0,0 @@ - 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/changes/bug2933 b/changes/bug2933 deleted file mode 100644 index 7aaf526..0000000 --- a/changes/bug2933 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Fix an uncommon assertion failure when running with DNSPort under - heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. - diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym deleted file mode 100644 index ab2fd61..0000000 --- a/changes/forget-rend-descs-on-newnym +++ /dev/null @@ -1,9 +0,0 @@ - o Security fixes: - - Forget all hidden service descriptors cached as a client when - processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on - 0.0.6. - o Code simplifications and refactoring: - - Allow rend_client_send_introduction to fail without closing the - AP connection permanently. - - diff --git a/changes/geoip-apr2011 b/changes/geoip-apr2011 deleted file mode 100644 index c38f8ae..0000000 --- a/changes/geoip-apr2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the April 1 2011 Maxmind GeoLite Country database. - diff --git a/changes/geoip-mar2011 b/changes/geoip-mar2011 deleted file mode 100644 index fda927f..0000000 --- a/changes/geoip-mar2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the March 1 2011 Maxmind GeoLite Country database. - diff --git a/changes/ipv6_crash b/changes/ipv6_crash deleted file mode 100644 index 02f8aaa..0000000 --- a/changes/ipv6_crash +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Fix a crash in parsing router descriptors containing IPv6 - addresses. This one crashed the directory authorities when somebody - fired up some experimental code. Bugfix on 0.2.1.3-alpha. diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl deleted file mode 100644 index dd8e10a..0000000 --- a/changes/zlib_aint_openssl +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - When warning about missing zlib development packages, give the - correct package names. Bugfix on 0.2.0.1-alpha.

1 0

[tor/maint-0.2.2] another changelog heuristic based on 0.2.3.1-alpha
by arma＠torproject.org 11 May '11

11 May '11

commit ec25c1f6ca38e1c00704242dc5a2326a828e3b56 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 10 21:30:55 2011 -0400 another changelog heuristic based on 0.2.3.1-alpha --- doc/HACKING | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index feafb55..7ff9c5f 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -435,6 +435,8 @@ interesting and understandable. Make stuff very terse + Make sure each section name ends with a colon + Describe the user-visible problem right away Mention relevant config options by name. If they're rare or unusual,

1 0

[tor/release-0.2.1] Allow rend_client_send_introduction to fail transiently
by arma＠torproject.org 11 May '11

11 May '11

commit 2ad18ae7366ce4979b44fa53d0105940005489c0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 25 08:36:02 2011 -0700 Allow rend_client_send_introduction to fail transiently i.e. without closing the AP connection. --- changes/forget-rend-descs-on-newnym | 4 ++++ src/or/circuituse.c | 18 ++++++++++++------ src/or/rendclient.c | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym index c086973..ab2fd61 100644 --- a/changes/forget-rend-descs-on-newnym +++ b/changes/forget-rend-descs-on-newnym @@ -2,4 +2,8 @@ - Forget all hidden service descriptors cached as a client when processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on 0.0.6. + o Code simplifications and refactoring: + - Allow rend_client_send_introduction to fail without closing the + AP connection permanently. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 996c99c..247aca7 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1560,14 +1560,20 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn) "introduction. (stream %d sec old)", introcirc->_base.n_circ_id, rendcirc->_base.n_circ_id, conn_age); - if (rend_client_send_introduction(introcirc, rendcirc) < 0) { + switch (rend_client_send_introduction(introcirc, rendcirc)) { + case 0: /* success */ + rendcirc->_base.timestamp_dirty = time(NULL); + introcirc->_base.timestamp_dirty = time(NULL); + assert_circuit_ok(TO_CIRCUIT(rendcirc)); + assert_circuit_ok(TO_CIRCUIT(introcirc)); + return 0; + case -1: /* transient error */ + return 0; + case -2: /* permanent error */ return -1; + default: /* oops */ + tor_fragile_assert(); } - rendcirc->_base.timestamp_dirty = time(NULL); - introcirc->_base.timestamp_dirty = time(NULL); - assert_circuit_ok(TO_CIRCUIT(rendcirc)); - assert_circuit_ok(TO_CIRCUIT(introcirc)); - return 0; } } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 37cca14..ca846d9 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -77,7 +77,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, log_warn(LD_REND, "query %s didn't have valid rend desc in cache. Failing.", escaped_safe_str(introcirc->rend_data->onion_address)); - goto err; + goto perm_err; } /* first 20 bytes of payload are the hash of Bob's pk */ @@ -115,13 +115,13 @@ rend_client_send_introduction(origin_circuit_t *introcirc, log_info(LD_REND, "Internal error: could not find intro key; we " "only have a v2 rend desc with %d intro points.", num_intro_points); - goto err; + goto perm_err; } } } if (crypto_pk_get_digest(intro_key, payload)<0) { log_warn(LD_BUG, "Internal error: couldn't hash public key."); - goto err; + goto perm_err; } /* Initialize the pending_final_cpath and start the DH handshake. */ @@ -132,11 +132,11 @@ rend_client_send_introduction(origin_circuit_t *introcirc, cpath->magic = CRYPT_PATH_MAGIC; if (!(cpath->dh_handshake_state = crypto_dh_new(DH_TYPE_REND))) { log_warn(LD_BUG, "Internal error: couldn't allocate DH."); - goto err; + goto perm_err; } if (crypto_dh_generate_public(cpath->dh_handshake_state)<0) { log_warn(LD_BUG, "Internal error: couldn't generate g^x."); - goto err; + goto perm_err; } } @@ -186,7 +186,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, if (crypto_dh_get_public(cpath->dh_handshake_state, tmp+dh_offset, DH_KEY_LEN)<0) { log_warn(LD_BUG, "Internal error: couldn't extract g^x."); - goto err; + goto perm_err; } note_crypto_pk_op(REND_CLIENT); @@ -199,7 +199,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, PK_PKCS1_OAEP_PADDING, 0); if (r<0) { log_warn(LD_BUG,"Internal error: hybrid pk encrypt failed."); - goto err; + goto perm_err; } payload_len = DIGEST_LEN + r; @@ -212,17 +212,17 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->cpath->prev)<0) { /* introcirc is already marked for close. leave rendcirc alone. */ log_warn(LD_BUG, "Couldn't send INTRODUCE1 cell"); - return -1; + return -2; } /* Now, we wait for an ACK or NAK on this circuit. */ introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; return 0; -err: +perm_err: circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL); - return -1; + return -2; } /** Called when a rendezvous circuit is open; sends a establish

1 0

[tor/release-0.2.1] Forget all rendezvous client state on SIGNAL NEWNYM
by arma＠torproject.org 11 May '11

11 May '11

commit 440e48ddf27094e48c401c68c9014eca43b6867e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Apr 20 02:27:58 2011 -0700 Forget all rendezvous client state on SIGNAL NEWNYM --- changes/forget-rend-descs-on-newnym | 5 ++++ src/or/main.c | 2 + src/or/or.h | 2 + src/or/rendclient.c | 37 +++++++++++++++++++++++++++++++++++ src/or/rendcommon.c | 10 +++++++++ 5 files changed, 56 insertions(+), 0 deletions(-) diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym new file mode 100644 index 0000000..c086973 --- /dev/null +++ b/changes/forget-rend-descs-on-newnym @@ -0,0 +1,5 @@ + o Security fixes: + - Forget all hidden service descriptors cached as a client when + processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on + 0.0.6. + diff --git a/src/or/main.c b/src/or/main.c index 96b7b45..e44fd49 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -785,6 +785,8 @@ signewnym_impl(time_t now) { circuit_expire_all_dirty_circs(); addressmap_clear_transient(); + rend_cache_purge(); + rend_client_cancel_descriptor_fetches(); time_of_last_signewnym = now; signewnym_is_pending = 0; } diff --git a/src/or/or.h b/src/or/or.h index 57e091e..897ad32 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4039,6 +4039,7 @@ int rend_client_introduction_acked(origin_circuit_t *circ, size_t request_len); void rend_client_refetch_renddesc(const char *query); void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query); +void rend_client_cancel_descriptor_fetches(void); int rend_client_remove_intro_point(extend_info_t *failed_intro, const rend_data_t *rend_query); int rend_client_rendezvous_acked(origin_circuit_t *circ, @@ -4137,6 +4138,7 @@ typedef struct rend_cache_entry_t { void rend_cache_init(void); void rend_cache_clean(void); void rend_cache_clean_v2_descs_as_dir(void); +void rend_cache_purge(void); void rend_cache_free_all(void); int rend_valid_service_id(const char *query); int rend_cache_lookup_desc(const char *query, int version, const char **desc, diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 51306b3..37cca14 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -557,8 +557,45 @@ rend_client_refetch_v2_renddesc(const rend_data_t *rend_query) return; } +/** Cancel all rendezvous descriptor fetches currently in progress. + */ +void +rend_client_cancel_descriptor_fetches(void) +{ + smartlist_t *connection_array = get_connection_array(); + + SMARTLIST_FOREACH_BEGIN(connection_array, connection_t *, conn) { + if (conn->type == CONN_TYPE_DIR && + (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC || + conn->purpose == DIR_PURPOSE_FETCH_RENDDESC_V2)) { + /* It's a rendezvous descriptor fetch in progress -- cancel it + * by marking the connection for close. + * + * Even if this connection has already reached EOF, this is + * enough to make sure that if the descriptor hasn't been + * processed yet, it won't be. See the end of + * connection_handle_read; connection_reached_eof (indirectly) + * processes whatever response the connection received. */ + + const rend_data_t *rd = (TO_DIR_CONN(conn))->rend_data; + if (!rd) { + log_warn(LD_BUG | LD_REND, + "Marking for close dir conn fetching rendezvous " + "descriptor for unknown service!"); + } else { + log_debug(LD_REND, "Marking for close dir conn fetching v%d " + "rendezvous descriptor for service %s", + (int)(rd->rend_desc_version), + safe_str(rd->onion_address)); + } + connection_mark_for_close(conn); + } + } SMARTLIST_FOREACH_END(conn); +} + /** Remove failed_intro from ent. If ent now has no intro points, or * service is unrecognized, then launch a new renddesc fetch. + * * Return -1 if error, 0 if no intro points remain or service * unrecognized, 1 if recognized and some intro points remain. diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index d6f5443..ba28cca 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -871,6 +871,16 @@ rend_cache_clean(void) } } +/** Remove ALL entries from the rendezvous service descriptor cache. + */ +void +rend_cache_purge(void) +{ + if (rend_cache) + strmap_free(rend_cache, _rend_cache_entry_free); + rend_cache = strmap_new(); +} + /** Remove all old v2 descriptors and those for which this hidden service * directory is not responsible for any more. */ void

1 0

[tor/release-0.2.1] Fix a failure case of connection_ap_handshake_attach_circuit()
by arma＠torproject.org 11 May '11

11 May '11

commit 8a36f2125137dc31a0771a8eeac0f2bb8c1343d0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 28 01:48:25 2011 +0200 Fix a failure case of connection_ap_handshake_attach_circuit() tor_fragile_assert() might be a no-op, so we have to return something here to indicate failure to the caller. --- src/or/circuituse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 247aca7..6a9c397 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1573,6 +1573,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn) return -1; default: /* oops */ tor_fragile_assert(); + return -1; } } }

1 0

[tor/release-0.2.1] Fix a bug introduced by purging rend_cache on NEWNYM
by arma＠torproject.org 11 May '11

11 May '11

commit f1cf9bd74d225e90ca123eb664c1c5538eedaa03 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 25 06:38:35 2011 -0700 Fix a bug introduced by purging rend_cache on NEWNYM If the user sent a SIGNAL NEWNYM command after we fetched a rendezvous descriptor, while we were building the introduction-point circuit, we would give up entirely on trying to connect to the hidden service. Original patch by rransom slightly edited to go into 0.2.1 --- src/or/rendclient.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index ca846d9..fb95efb 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -74,10 +74,27 @@ rend_client_send_introduction(origin_circuit_t *introcirc, if (rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, &entry) < 1) { - log_warn(LD_REND, - "query %s didn't have valid rend desc in cache. Failing.", - escaped_safe_str(introcirc->rend_data->onion_address)); - goto perm_err; + log_info(LD_REND, + "query %s didn't have valid rend desc in cache. " + "Refetching descriptor.", + safe_str(introcirc->rend_data->onion_address)); + /* Fetch both v0 and v2 rend descriptors in parallel. Use whichever + * arrives first. Exception: When using client authorization, only + * fetch v2 descriptors.*/ + rend_client_refetch_v2_renddesc(introcirc->rend_data); + if (introcirc->rend_data->auth_type == REND_NO_AUTH) + rend_client_refetch_renddesc(introcirc->rend_data->onion_address); + { + connection_t *conn; + + while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP, + AP_CONN_STATE_CIRCUIT_WAIT, + introcirc->rend_data->onion_address, -1))) { + conn->state = AP_CONN_STATE_RENDDESC_WAIT; + } + } + + return -1; } /* first 20 bytes of payload are the hash of Bob's pk */

1 0

[tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1
by arma＠torproject.org 11 May '11

11 May '11

1 0

[tor/release-0.2.1] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
by arma＠torproject.org 11 May '11

11 May '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0

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

11 May '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.1] Add an XXX
by arma＠torproject.org 11 May '11

11 May '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