Nick Mathewson
cf8117136c
Merge remote-tracking branch 'public/bug4457_022' into bug4457_master
...
Conflicts:
src/common/compat_libevent.c
Resolving conflict by not taking 7363eae13c
("Use the
EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation"): in
Tor 0.2.3.x, we _do_ sometimes use notifiable event bases.
2011-11-14 17:59:42 -05:00
Nick Mathewson
0f6c021617
Detect failure from event_init() or event_base_new_with_config()
2011-11-14 17:53:45 -05:00
Nick Mathewson
7363eae13c
Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
...
In Tor 0.2.2, we never need the event base to be notifiable, since we
don't call it from other threads. This is a workaround for bug 4457,
which is not actually a Tor bug IMO.
2011-11-14 17:48:57 -05:00
Nick Mathewson
8592126a18
Merge remote-tracking branch '4ZM/topic/test/4433_address'
2011-11-14 12:53:34 -05:00
Nick Mathewson
9292a78722
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-14 11:10:45 -05:00
Nick Mathewson
2b7bdc295a
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-14 11:10:27 -05:00
Nick Mathewson
13f02c387f
Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1
2011-11-14 11:10:10 -05:00
George Kadianakis
406ae1ba5a
Use callback-driven approach to block renegotiations.
...
Also use this new approach in the bufferevents-enabled case.
2011-11-13 14:47:11 +01:00
Gisle Vanem
af12a7ac00
Fix test_util.c compilation on MSVC
...
"Those '{}' constructs are not well liked by MSVC (cl v.16.xx)."
Received on tor-dev; fixes bug on 0.2.3.3-alpha.
2011-11-11 23:49:53 -05:00
Nick Mathewson
ce51887291
All-in-one benchmark test for cell crypto
2011-11-11 13:06:17 -05:00
Nick Mathewson
4c9b6df84d
Convert bench_dmap to produce reasonable output.
2011-11-11 12:46:22 -05:00
Nick Mathewson
ff93535c71
New src/test/bench.c to allow us to actually _run_ benchmark code
...
Yes, the timing functions are suboptimal. Please improve!
2011-11-11 12:35:08 -05:00
Sebastian Hahn
a2ecf131f3
Remove the torint.h include from aes.h
...
This hasn't been needed for a while, there's nothing in aes.h now that
would need uint* stuff.
2011-11-11 11:47:25 -05:00
Sebastian Hahn
38123ffa23
Fix the bench_{aes,dmap} test functions to work with TT
...
TT expects them to be named test_bench_{aes,dmap}. Also change the
DISABLED macro to reflect that.
2011-11-11 11:47:25 -05:00
Nick Mathewson
46d236c684
Remove vestiges of RIJNDAEL_COUNTER_OPTIMIZATION
2011-11-11 11:47:25 -05:00
Nick Mathewson
7d8edfcceb
Stop using "u32" and "u8" in aes.c
2011-11-11 11:47:24 -05:00
Nick Mathewson
21cf7079fe
Dump our internal AES implementation
...
This thing was pretty pointless on versions of OpenSSL 0.9.8 and later,
and almost totally pointless on OpenSSL 1.0.0.
Also, favor EVP by default, since it lets us get hardware acceleration
where present. (See issue 4442)
2011-11-11 11:47:24 -05:00
Nick Mathewson
613ff5698a
Changes file for patches from 4ZM
2011-11-11 11:11:15 -05:00
Nick Mathewson
d348cfdbdf
Merge remote-tracking branch '4ZM/topic/test/4434_address'
2011-11-11 11:07:29 -05:00
Anders Sundman
ca1e88a0db
Unit tests for tor_addr_to_str
2011-11-11 08:32:26 +01:00
Anders Sundman
b6b7efc084
Unit tests for tor_addr_to_PTR_name
2011-11-11 08:14:42 +01:00
Anders Sundman
1b97588a31
Return value bugfix of tor_addr_to_PTR_name
...
Returns value semantics was inconsitent between IPv4 and IPv6
2011-11-11 08:14:32 +01:00
Anders Sundman
930eed21c3
Fixed buffer bounds check bug in tor_addr_to_str
2011-11-11 07:53:58 +01:00
Anders Sundman
8c7658dfdf
Unit tests for tor_inet_ntop
2011-11-11 07:49:41 +01:00
Anders Sundman
01e1dc0e62
Fixed of-by-one error in tor_inet_ntop
...
The of-by-one error could lead to 1 byte buffer over runs IPv6 for addresses.
2011-11-11 07:47:00 +01:00
Anders Sundman
8d6ce1625f
Unit tests for eat_whitespace functions
2011-11-10 23:26:39 +01:00
Anders Sundman
c0efd461d3
Unit test for n_bits_set func
2011-11-10 23:26:39 +01:00
Anders Sundman
fa9aef6eec
Unit test for hex_str func
...
Note: Too long input is undefined by contract. That behaviour should not be asserted in test.
2011-11-10 23:26:29 +01:00
Nick Mathewson
e1c6431e42
Correct the handling of overflow behavior in smartlist_ensure_capacity
...
The old behavior was susceptible to the compiler optimizing out our
assertion check, *and* could still overflow size_t on 32-bit systems
even when it did work.
2011-11-09 14:48:52 -05:00
Nick Mathewson
f0589da0e3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 11:04:40 -05:00
Nick Mathewson
8adec87050
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
2011-11-09 11:03:20 -05:00
Nick Mathewson
9452b65680
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 10:28:43 -05:00
Sebastian Hahn
0cc7a63fc0
Don't warn when compiling with --disable-threads
...
STMT_VOID semantics suggested by nick, thanks!
2011-11-09 10:26:35 +01:00
Nick Mathewson
d4489a2851
Rewrite comment at head of eventdns.c
...
Let's make it more obvious to the everyday reader that eventdns.c is
a) Based on Libevent's evdns.c
b) Slated for demolition
c) Supposed to keep API-compatibility with Libevent.
d) Not worth tweaking unless there's a bug.
2011-11-09 00:23:44 -05:00
Robert Ransom
565463243c
Include HiddenServiceDir in some warning messages
2011-11-07 17:02:50 -08:00
Robert Ransom
bfb900e426
Add some XXXes
2011-11-07 15:32:43 -08:00
Robert Ransom
ef2b0bd528
Add GETINFO md/id/* and md/name/* items for relay microdescs
2011-11-07 15:32:33 -08:00
Roger Dingledine
e26f5553ec
fold in changes files
2011-11-07 15:22:23 -05:00
Nick Mathewson
4a7225d4c9
Merge remote-tracking branch 'rransom-tor/bug4411'
2011-11-07 11:57:07 -05:00
Nick Mathewson
25875f533b
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 11:55:11 -05:00
Nick Mathewson
8ba1cf3007
Robert says that this bug was not in fact one of frosty's
2011-11-07 11:54:54 -05:00
Robert Ransom
749b37bcf4
Fix assert on clients of and authorities for v0 HS descs
2011-11-07 08:48:23 -08:00
Nick Mathewson
ceebc8283f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 11:48:02 -05:00
Nick Mathewson
ca282e5326
Merge branch 'bug4424' into maint-0.2.2
2011-11-07 11:47:28 -05:00
Nick Mathewson
02d89c5c66
Remove an extraneous "if" in the 4424 fix
2011-11-07 11:46:51 -05:00
Nick Mathewson
21dd6eae9e
Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
2011-11-07 11:37:29 -05:00
Robert Ransom
65a0d7e7ef
Don't leak an extend_info_t in rend_client_any_intro_points_usable
2011-11-07 08:35:51 -08:00
Nick Mathewson
51f53b590e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 10:44:02 -05:00
Nick Mathewson
4d8306e0e9
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-07 10:42:34 -05:00
Karsten Loesing
6d45c6d548
Update to the November 2011 GeoIP database.
2011-11-07 14:23:48 +01:00