Nick Mathewson
f8c9cc713d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-18 10:14:40 -04:00
Nick Mathewson
efdf6c7118
Fix the remaining instances of nexted SMARTLIST_FOREACH
2012-07-17 10:41:24 -04:00
Nick Mathewson
6abdcdf116
Fix crash bug from 4a8eaad7 (Bug 6255)
...
We were doing a tor_strclear() on client_keys_str when it might not
even be set.
Fix for bug 6255; bug not in any release of Tor. Thanks to katmagic
for finding this one!
2012-06-29 00:32:27 -04:00
Nick Mathewson
888d5d08fe
Merge remote-tracking branch 'public/bug2385'
2012-06-25 12:05:36 -04:00
Nick Mathewson
4a8eaad7ef
Clear a couple more fields in rend_service_load_auth_keys
2012-06-18 13:13:53 -04:00
Nick Mathewson
b8d1e8e375
Refactor exit path in rend_service_load_auth_keys
...
Now it's an orthodox "goto err/done" exit path, and it isn't some
screwy thing where we stick err/done at the end of a loop and
duplicate our cleanup code.
2012-06-18 13:10:02 -04:00
Nick Mathewson
e5a61c5176
Fix indentation in rend_service_load_auth_keys
2012-06-18 13:01:33 -04:00
Nick Mathewson
be28d10622
Refactor rend_service_load_keys() into main portion and auth portion.
2012-06-18 12:59:29 -04:00
Nick Mathewson
53f5a38942
Fix indentation and whitespace in rend_service_load_keys
2012-06-18 12:45:55 -04:00
Nick Mathewson
b44693f32d
Refactor rend_service_load_keys() into outer loop and loop contents
2012-06-18 12:43:20 -04:00
Nick Mathewson
e6782b355a
Merge remote-tracking branch 'public/bug3311'
2012-06-18 12:07:39 -04:00
Andrea Shepard
ab2e007ffb
In rend_service_load_keys(), clear extended descriptor cookie and buffer, clear temporary heap space for client key, and check if serializing client key fails
2012-06-15 21:17:02 -07:00
Andrea Shepard
276f95182c
Clean keys on stack in rend_service_rendezvous_has_opened()
2012-06-15 20:54:45 -07:00
Andrea Shepard
88c5d3ca55
Clean keys on stack in rend_service_intro_has_opened()
2012-06-15 20:43:33 -07:00
Andrea Shepard
d43ba536df
Clean up keys on stack in rend_service_introduce()
2012-06-15 20:19:02 -07:00
Andrea Shepard
9f55dfd915
Clean up keys on stack in rend_service_load_keys()
2012-06-15 19:54:54 -07:00
Nick Mathewson
87409771c4
Clarify some messages about publishing hidden service descriptors
...
Fix for bug 3311.
2012-06-15 15:25:46 -04:00
Nick Mathewson
2491fff5a6
Triage the XXX023 and XXX022 comments: postpone many.
2012-06-15 15:07:52 -04:00
Nick Mathewson
0fa107a6aa
Update copyright dates to 2012; add a few missing copyright statements
2012-06-04 20:58:17 -04:00
Robert Ransom
627c37ad6a
Don't reset intro-point creation rate-limiting timer
...
Previously, we would reset it at the drop of a hat -- every time a second
passes without any of the intro-point circs already launched for the
service failing.
Fixes bug 4607.
2012-04-20 17:23:31 -04:00
Nick Mathewson
e9dae1ff2e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rendservice.c
Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.
2012-04-18 22:30:02 -04:00
George Kadianakis
2d276ab9d9
rend_service_introduce(): do protocol violation check before anything else.
...
(Cherry-picked from 6ba13e4 by nickm)
2012-04-18 22:26:06 -04:00
Nick Mathewson
26e789fbfd
Rename nonconformant identifiers.
...
Fixes bug 4893.
These changes are pure mechanical, and were generated with this
perl script:
/usr/bin/perl -w -i.bak -p
s/crypto_pk_env_t/crypto_pk_t/g;
s/crypto_dh_env_t/crypto_dh_t/g;
s/crypto_cipher_env_t/crypto_cipher_t/g;
s/crypto_digest_env_t/crypto_digest_t/g;
s/aes_free_cipher/aes_cipher_free/g;
s/crypto_free_cipher_env/crypto_cipher_free/g;
s/crypto_free_digest_env/crypto_digest_free/g;
s/crypto_free_pk_env/crypto_pk_free/g;
s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g;
s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g;
s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g;
s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g;
s/crypto_new_cipher_env/crypto_cipher_new/g;
s/crypto_new_digest_env/crypto_digest_new/g;
s/crypto_new_digest256_env/crypto_digest256_new/g;
s/crypto_new_pk_env/crypto_pk_new/g;
s/crypto_create_crypto_env/crypto_cipher_new/g;
s/connection_create_listener/connection_listener_new/g;
s/smartlist_create/smartlist_new/g;
s/transport_create/transport_new/g;
2012-01-18 15:53:30 -05:00
Nick Mathewson
f729e1e984
Merge branch 'feature3457-v4-nm-squashed'
...
Conflicts:
src/or/rendclient.c
2012-01-11 12:10:14 -05:00
Nick Mathewson
fe4811471d
Chop out the intro point calculation until it is simple enough for nickm to grok
2012-01-10 19:20:00 -05:00
Robert Ransom
31d6350737
Use my original formula for number of replacements for an intro point
...
A fixup commit which was intended to make this formula easier to read
broke it instead.
2012-01-10 19:20:00 -05:00
Nick Mathewson
838ec086be
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-01-09 12:22:29 -05:00
Nick Mathewson
6fd61cf767
Fix a trivial log message error in renservice.c
...
Fixes bug 4856; bugfix on 0.0.6
This bug was introduced in 79fc5217
2012-01-09 12:21:04 -05:00
Nick Mathewson
d4de312b3c
Merge remote-tracking branch 'rransom-tor/bug4842'
2012-01-09 11:59:08 -05:00
Roger Dingledine
19c372daf0
clean up a comment that confused arturo
2012-01-07 07:41:46 -05:00
Robert Ransom
b46a7ebb2b
Don't remove rend cpath element from relaunched service-side rend circs
...
Fixes bug 4842, not in any release.
2012-01-06 22:44:20 -08:00
Robert Ransom
f88c8ca8c9
Don't close HS service-side rend circs on timeout
2011-12-27 08:02:43 -08:00
Nick Mathewson
ba1766bc3f
Add explicit cast to make gcc happy
2011-12-20 11:19:57 -05:00
Robert Ransom
dae000735e
Adjust n_intro_points_wanted when a service's intro points are closed
2011-12-20 11:15:33 -05:00
Robert Ransom
46783eb6d7
Extract function to determine how many intros an intro point has handled
2011-12-20 11:15:31 -05:00
Robert Ransom
5ffa7102c0
Don't segfault when checking whether a not-yet-used intro point should expire
...
Found by katmagic. Bugfix on the #3460 branch, not yet in any release.
2011-12-01 15:26:45 -08:00
Nick Mathewson
d04f21bf39
Merge branch 'feature2553-v4-rebased'
2011-11-30 14:54:33 -05:00
Robert Ransom
a364f88477
Add ifdefs to disable #3332 assertions
2011-11-30 14:54:15 -05:00
Nick Mathewson
c5e2bfa983
appease "make check-spaces"
2011-11-30 12:09:53 -05:00
Linus Nordberg
f786307ab7
First chunk of support for bridges on IPv6
...
Comments below focus on changes, see diff for added code.
New type tor_addr_port_t holding an IP address and a TCP/UDP port.
New flag in routerinfo_t, ipv6_preferred. This should go in the
node_t instead but not now.
Replace node_get_addr() with
- node_get_prim_addr() for primary address, i.e. IPv4 for now
- node_get_pref_addr() for preferred address, IPv4 or IPv6.
Rename node_get_addr_ipv4h() node_get_prim_addr_ipv4h() for
consistency. The primary address will not allways be an IPv4 address.
Same for node_get_orport() -> node_get_prim_orport().
Rewrite node_is_a_configured_bridge() to take all OR ports into account.
Extend argument list to extend_info_from_node and
extend_info_from_router with a flag indicating if we want to use the
routers primary address or the preferred address. Use the preferred
address in as few situtations as possible for allowing clients to
connect to bridges over IPv6.
2011-11-30 11:55:45 -05:00
Nick Mathewson
628b735fe3
Merge remote-tracking branch 'rransom-tor/bug3460-v4'
...
Conflicts:
src/or/rendservice.c
2011-11-29 20:56:39 -05:00
Robert Ransom
a2791f43f5
Correct documentation comments for fields formerly named accepted_intros
2011-11-27 09:30:16 -08:00
Robert Ransom
256bcb4755
Rename accepted_intros fields
2011-11-27 09:26:48 -08:00
Robert Ransom
104c50fedb
Log whenever a circuit's purpose is changed
2011-11-24 06:52:38 -08:00
Nick Mathewson
6a6233b70b
Fix a couple of memory leaks in rend_add_service spotted by coverity
2011-11-17 17:14:49 -05:00
Nick Mathewson
f0589da0e3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 11:04:40 -05:00
Robert Ransom
565463243c
Include HiddenServiceDir in some warning messages
2011-11-07 17:02:50 -08:00
Robert Ransom
272dd90b5c
Ignore timestamps of INTRODUCE2 cells
2011-10-31 05:05:45 -07:00
Robert Ransom
1a52a947c5
Move the real INTRODUCE2 replay-detection cache into rend_intro_point_t
2011-10-30 04:46:58 -07:00
Robert Ransom
1eba4f0cc3
Make introduction points expire
2011-10-30 02:17:59 -07:00
