]>
git.ipfire.org Git - thirdparty/tor.git/log
Roger Dingledine [Sat, 10 Aug 2013 22:30:20 +0000 (18:30 -0400)]
Merge branch 'maint-0.2.4'
Nick Mathewson [Mon, 5 Aug 2013 15:40:33 +0000 (11:40 -0400)]
Fix an uninitialized-read when parsing v3 introduction requests.
Fortunately, later checks mean that uninitialized data can't get sent
to the network by this bug. Unfortunately, reading uninitialized heap
*can* (in some cases, with some allocators) cause a crash if you get
unlucky and go off the end of a page.
Found by asn. Bugfix on 0.2.4.1-alpha.
Nick Mathewson [Tue, 6 Aug 2013 16:00:16 +0000 (12:00 -0400)]
Update coverage instructions
Roger Dingledine [Mon, 5 Aug 2013 06:47:40 +0000 (02:47 -0400)]
forward-port 0.2.4.15-rc changelog
Roger Dingledine [Mon, 5 Aug 2013 06:42:27 +0000 (02:42 -0400)]
forward-port the reformat of changelog stanza
Arlo Breault [Sun, 4 Aug 2013 05:36:32 +0000 (22:36 -0700)]
Use size_t for length in replaycache_add_test_and_elapsed()
For consistency with the rest of buffer lengths in Tor.
See #8960
Andrea Shepard [Sat, 3 Aug 2013 01:49:57 +0000 (18:49 -0700)]
Fix tor_get_lines_from_handle() for make check-spaces
Nick Mathewson [Fri, 2 Aug 2013 17:44:22 +0000 (13:44 -0400)]
Unit test for smartlist_ints_eq
(This was the only wholly untested function in containers.c)
Nick Mathewson [Fri, 2 Aug 2013 15:04:30 +0000 (11:04 -0400)]
Try to make the win32 ersatz_socketpair pass.
Nick Mathewson [Fri, 2 Aug 2013 14:52:57 +0000 (10:52 -0400)]
Fixed "unused parameter cloexec" warnings on windows
Nick Mathewson [Fri, 2 Aug 2013 14:36:36 +0000 (10:36 -0400)]
Unit test for tor_{ersatz_,}socketpair.
This catches tor_accept as well.
Nick Mathewson [Fri, 2 Aug 2013 14:36:01 +0000 (10:36 -0400)]
Split the socketpair replacement code into its own function for testing
Nick Mathewson [Fri, 2 Aug 2013 14:05:17 +0000 (10:05 -0400)]
Simple unit test for tor_open_socket_with_extensions
Nick Mathewson [Fri, 2 Aug 2013 14:04:21 +0000 (10:04 -0400)]
Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case
Peter Retzlaff [Mon, 27 May 2013 19:16:43 +0000 (19:16 +0000)]
Prepare patch for ticket 5129 for merging.
- Preserve old eventdns code.
- Add function to close sockets cross-platform, without accounting.
- Add changes/ file.
Nick Mathewson [Thu, 1 Aug 2013 01:49:30 +0000 (21:49 -0400)]
Merge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 1 Aug 2013 01:48:48 +0000 (21:48 -0400)]
Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
Nick Mathewson [Wed, 31 Jul 2013 18:19:29 +0000 (14:19 -0400)]
Fix compilation on Windows
(Bugfix on tests for #9288 fix; bug not in any released Tor)
Nick Mathewson [Wed, 31 Jul 2013 18:03:05 +0000 (14:03 -0400)]
Merge remote-tracking branch 'origin/maint-0.2.4'
George Kadianakis [Thu, 18 Jul 2013 13:01:49 +0000 (16:01 +0300)]
Fix invalid-read when a managed proxy configuration fails.
Nick Mathewson [Wed, 31 Jul 2013 17:51:15 +0000 (13:51 -0400)]
Merge branch 'bug9288_rebased'
Conflicts:
src/test/test_pt.c
Nick Mathewson [Wed, 31 Jul 2013 17:36:17 +0000 (13:36 -0400)]
Fix mixed declaration/statement warning
Nick Mathewson [Mon, 29 Jul 2013 15:37:39 +0000 (11:37 -0400)]
Update pt/configure_proxy until it stops segfaulting
George Kadianakis [Mon, 29 Jul 2013 14:01:10 +0000 (16:01 +0200)]
Modifications to transports.c for the unit tests to work.
Both 'managed_proxy_list' and 'unconfigured_proxies_n' are global
src/or/transports.c variables that are not initialized properly when
unit tests are run.
George Kadianakis [Mon, 29 Jul 2013 13:59:59 +0000 (15:59 +0200)]
Write unit tests for configure_proxy().
George Kadianakis [Mon, 29 Jul 2013 13:46:57 +0000 (15:46 +0200)]
Prepare some mock functions to test #9288.
George Kadianakis [Thu, 18 Jul 2013 13:01:49 +0000 (16:01 +0300)]
Fix invalid-read when a managed proxy configuration fails.
Roger Dingledine [Tue, 30 Jul 2013 16:05:39 +0000 (12:05 -0400)]
NumDirectoryGuards now tracks NumEntryGuards by default
Now a user who changes only NumEntryGuards will get the behavior she
expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
Nick Mathewson [Fri, 26 Jul 2013 14:07:11 +0000 (16:07 +0200)]
Allow {,k,kilo,m,mega,g,giga,t,tera}bit{,s} in torrc
Patch from CharlieB for ticket #9214
Nick Mathewson [Fri, 26 Jul 2013 13:42:10 +0000 (15:42 +0200)]
Merge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 26 Jul 2013 13:41:35 +0000 (15:41 +0200)]
Merge branch 'bug9337' into maint-0.2.4
Nick Mathewson [Fri, 26 Jul 2013 13:33:46 +0000 (15:33 +0200)]
Avoid assertion failure on unexepcted address family in DNS reply.
Fixes bug 9337; bugfix on 0.2.4.7-alpha.
Nick Mathewson [Tue, 23 Jul 2013 09:52:10 +0000 (11:52 +0200)]
Fix bug9309, and n_noncanonical count/continue code
When we moved channel_matches_target_addr_for_extend() into a separate
function, its sense was inverted from what one might expect, and we
didn't have a ! in one place where we should have.
Found by skruffy.
Roger Dingledine [Fri, 19 Jul 2013 03:35:20 +0000 (23:35 -0400)]
fix typo
Nick Mathewson [Tue, 23 Jul 2013 09:52:10 +0000 (11:52 +0200)]
Fix bug9309, and n_noncanonical count/continue code
When we moved channel_matches_target_addr_for_extend() into a separate
function, its sense was inverted from what one might expect, and we
didn't have a ! in one place where we should have.
Found by skruffy.
Nick Mathewson [Fri, 19 Jul 2013 16:05:38 +0000 (12:05 -0400)]
Whoops; check in test_circuitmux.c
Nick Mathewson [Fri, 19 Jul 2013 15:58:20 +0000 (11:58 -0400)]
Merge branch 'bug9296'
Nick Mathewson [Fri, 19 Jul 2013 14:17:00 +0000 (10:17 -0400)]
Regression test for destroy cell queue
This exercises the code that crashed and caused #9296.
Nick Mathewson [Fri, 19 Jul 2013 13:49:35 +0000 (09:49 -0400)]
Initialize destroy_cell_queue.
Likely fix for the crash bug of #9296, which was introduced through a
combination of #7912 and #8586. Bugfix not in any released Tor.
Roger Dingledine [Fri, 19 Jul 2013 03:35:20 +0000 (23:35 -0400)]
fix typo
Nick Mathewson [Fri, 19 Jul 2013 03:17:57 +0000 (23:17 -0400)]
Merge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 19 Jul 2013 03:17:05 +0000 (23:17 -0400)]
Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
Nick Mathewson [Fri, 19 Jul 2013 03:15:46 +0000 (23:15 -0400)]
Fix for bug 9295: Don't crash when running --hash-password.
Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're
considering #9122 for an 0.2.3 backport, and if we do, we should merge
this too.
Nick Mathewson [Fri, 19 Jul 2013 03:08:36 +0000 (23:08 -0400)]
tmp
Nick Mathewson [Thu, 18 Jul 2013 18:38:31 +0000 (14:38 -0400)]
Start of a unit test for options_validate.
I added this so I could write a unit test for ServerTransportOptions,
but it incidentally exercises the succeed-on-defaults case of
options_validate too.
Nick Mathewson [Thu, 18 Jul 2013 15:24:57 +0000 (11:24 -0400)]
Merge branch 'simpleq_for_cells_3'
Nick Mathewson [Thu, 18 Jul 2013 15:21:27 +0000 (11:21 -0400)]
Add a test for n_cells_in_circuit_queues
Nick Mathewson [Thu, 18 Jul 2013 15:02:36 +0000 (11:02 -0400)]
Unit tests for cell queues.
This removes some INLINE markers from functions that probably didn't
need them.
Nick Mathewson [Fri, 22 Mar 2013 18:25:34 +0000 (14:25 -0400)]
Use TOR_SIMPLEQ for packed_cell_t
Nick Mathewson [Thu, 18 Jul 2013 12:56:02 +0000 (08:56 -0400)]
Remove a redundant declaration
Nick Mathewson [Thu, 18 Jul 2013 12:54:28 +0000 (08:54 -0400)]
Remove a stray debugging echo from configure.ac
Nick Mathewson [Thu, 18 Jul 2013 12:49:52 +0000 (08:49 -0400)]
Fix a wide line in test_pt.c
Nick Mathewson [Thu, 18 Jul 2013 12:48:20 +0000 (08:48 -0400)]
Merge branch 'bug8978_rebase_2'
Conflicts:
src/test/test_pt.c
Nick Mathewson [Thu, 18 Jul 2013 12:45:13 +0000 (08:45 -0400)]
Merge branch 'bug8929_rebase_2'
Nick Mathewson [Mon, 15 Jul 2013 21:32:08 +0000 (17:32 -0400)]
Improve test coverage of 8929 code
Nick Mathewson [Mon, 15 Jul 2013 17:26:47 +0000 (13:26 -0400)]
Fix memory leaks in test_config_parse_transport_options_line
Nick Mathewson [Mon, 15 Jul 2013 17:17:25 +0000 (13:17 -0400)]
Document what "escape" means in tor_escape_str_for_pt_args
George Kadianakis [Thu, 13 Jun 2013 09:18:07 +0000 (12:18 +0300)]
Insert the environment variable only if we have options to pass.
George Kadianakis [Wed, 12 Jun 2013 16:01:22 +0000 (19:01 +0300)]
Add changes file and enrich the manual page.
George Kadianakis [Wed, 12 Jun 2013 14:12:39 +0000 (17:12 +0300)]
Place the options in the environment after processing them properly.
George Kadianakis [Wed, 12 Jun 2013 13:36:13 +0000 (16:36 +0300)]
Rename tor_escape_str_for_socks_arg() to something more generic.
Since we are going to be using that function to also escape parameters
passed to transport proxies using environment variables.
George Kadianakis [Wed, 12 Jun 2013 13:23:16 +0000 (16:23 +0300)]
Pass characters to be escaped to tor_escape_str_for_socks_arg().
This is in preparation for using tor_escape_str_for_socks_arg() to
escape server-side pluggable transport parameters.
George Kadianakis [Wed, 12 Jun 2013 12:28:48 +0000 (15:28 +0300)]
Write unit tests for the ServerTransportOptions parsing function.
George Kadianakis [Wed, 12 Jun 2013 12:28:31 +0000 (15:28 +0300)]
Write function that parses ServerTransportOptions torrc lines.
And use it to validate them.
Nick Mathewson [Tue, 16 Jul 2013 15:53:36 +0000 (11:53 -0400)]
Add a basic unit test for pt_get_extra_info_descriptor_string.
Nick Mathewson [Tue, 16 Jul 2013 15:53:25 +0000 (11:53 -0400)]
Add a unit test for smethod lines with arguments.
George Kadianakis [Tue, 2 Jul 2013 16:33:55 +0000 (19:33 +0300)]
Write transport ARGS to extra-info descriptor.
George Kadianakis [Mon, 1 Jul 2013 13:45:21 +0000 (16:45 +0300)]
Extract ARGS from SMETHOD line and attach them to transport.
Nick Mathewson [Tue, 16 Jul 2013 19:31:07 +0000 (15:31 -0400)]
A python script to combin gcov output with git blame
Nick Mathewson [Tue, 16 Jul 2013 18:49:41 +0000 (14:49 -0400)]
Merge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 16 Jul 2013 18:48:12 +0000 (14:48 -0400)]
Re-do a cast in order to make old buggy freebsd gcc happy
Fix for #9254. Bugfix on 0.2.4.14-alpha.
This is not actually a bug in the Tor code.
Nick Mathewson [Tue, 16 Jul 2013 13:55:51 +0000 (09:55 -0400)]
Merge remote-tracking branch 'asn/bug9265'
Nick Mathewson [Tue, 16 Jul 2013 13:53:44 +0000 (09:53 -0400)]
Remove an unused variable in test_replaycache_scrub
Andrea Shepard [Tue, 16 Jul 2013 13:40:08 +0000 (06:40 -0700)]
Make contrib/coverage smarter about check file-existence edge cases
Andrea Shepard [Tue, 16 Jul 2013 13:02:22 +0000 (06:02 -0700)]
Add more replaycache.c unit tests, bringing coverage to 100% for that file
Andrea Shepard [Tue, 16 Jul 2013 13:01:50 +0000 (06:01 -0700)]
Eliminate an impossible case in replaycache_scrub_if_needed_internal()
George Kadianakis [Tue, 16 Jul 2013 11:07:03 +0000 (14:07 +0300)]
Test deeper in test_pt_parsing().
We used to test parse_{c,s}method_line() without actually testing that
the resulting transport_t was well formed.
Andrea Shepard [Tue, 16 Jul 2013 05:33:39 +0000 (22:33 -0700)]
Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am
Nick Mathewson [Mon, 15 Jul 2013 21:35:56 +0000 (17:35 -0400)]
Appease "make check-spaces"
Nick Mathewson [Mon, 15 Jul 2013 17:07:09 +0000 (13:07 -0400)]
Use format_hex_number_sigsafe to format syscalls in sandbox.c
This way, we don't have to use snprintf, which is not guaranteed to
be signal-safe.
(Technically speaking, strlen() and strlcpy() are not guaranteed to
be signal-safe by the POSIX standard. But I claim that they are on
every platform that supports libseccomp2, which is what matters
here.)
Nick Mathewson [Mon, 15 Jul 2013 16:52:29 +0000 (12:52 -0400)]
Lightly refactor and test format_hex_number_sigsafe
Better tests for upper bounds, and for failing cases.
Also, change the function's interface to take a buffer length rather
than a maximum length, and then NUL-terminate: functions that don't
NUL-terminate are trouble waiting to happen.
Nick Mathewson [Mon, 15 Jul 2013 16:39:47 +0000 (12:39 -0400)]
HEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe
Nick Mathewson [Mon, 15 Jul 2013 16:26:55 +0000 (12:26 -0400)]
Expose format_hex_number_..., and rename it to ..._sigsafe().
There are some other places in the code that will want a signal-safe
way to format numbers, so it shouldn't be static to util.c.
Nick Mathewson [Mon, 15 Jul 2013 16:17:23 +0000 (12:17 -0400)]
Don't build format_helper_exit_status on win32
The only thing that used format_helper_exit_status on win32 was the
unit tests. This caused an error when we tried to leave a static
format_helper_exit_status lying around in a production object file.
The easiest solution is to admit that this way of dealing with process
exit status is Unix-only.
Nick Mathewson [Mon, 15 Jul 2013 16:02:46 +0000 (12:02 -0400)]
Merge remote-tracking branch 'linus/unused_param'
Nick Mathewson [Mon, 15 Jul 2013 16:02:40 +0000 (12:02 -0400)]
Merge remote-tracking branch 'linus/binshify'
Nick Mathewson [Mon, 15 Jul 2013 16:02:18 +0000 (12:02 -0400)]
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Linus Nordberg [Mon, 15 Jul 2013 14:06:39 +0000 (16:06 +0200)]
Traditional /bin/sh is unhappy about {a,b} globbing.
Linus Nordberg [Mon, 15 Jul 2013 13:46:36 +0000 (15:46 +0200)]
Avoid compiler warning 'unused param'.
Fixes #9261.
Peter Palfrader [Mon, 15 Jul 2013 13:08:35 +0000 (15:08 +0200)]
Fix two pre-coffee typos
Peter Palfrader [Mon, 15 Jul 2013 08:55:11 +0000 (10:55 +0200)]
And a changes file for #9258
Peter Palfrader [Mon, 15 Jul 2013 08:46:22 +0000 (10:46 +0200)]
Reject relative control socket paths and emit a warning.
Previously we would accept relative paths, but only if they contained a
slash somewhere (not at the end).
Otherwise we would silently not work. Closes: #9258. Bugfix on
0.2.3.16-alpha.
Peter Palfrader [Mon, 15 Jul 2013 08:46:11 +0000 (10:46 +0200)]
Document get_parent_directory more
Roger Dingledine [Sun, 14 Jul 2013 06:49:34 +0000 (02:49 -0400)]
cosmetic cleanups
Roger Dingledine [Sun, 14 Jul 2013 00:31:18 +0000 (20:31 -0400)]
put sandbox.h in the tarball, so the tarball builds
Nick Mathewson [Fri, 12 Jul 2013 21:12:43 +0000 (17:12 -0400)]
Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'
Nick Mathewson [Thu, 11 Jul 2013 19:53:35 +0000 (15:53 -0400)]
Remove a bogus semicolon spotted by Gisle Vanem
Cristian Toader [Mon, 17 Jun 2013 10:07:14 +0000 (13:07 +0300)]
Add a basic seccomp2 syscall filter on Linux
It's controlled by the new Sandbox argument. Right now, it's rather
coarse-grained, it's Linux-only, and it may break some features.
Nick Mathewson [Wed, 10 Jul 2013 19:07:32 +0000 (15:07 -0400)]
Add some basic unit tests for the circuit map data structure.
These show off the new mocking code by mocking the circuitmux code
so that we can test the circuit map code in isolation.
Nick Mathewson [Wed, 10 Jul 2013 19:03:01 +0000 (15:03 -0400)]
Add rudimentary test mocking support.
This is not the most beautiful possible implementation (it requires
decorating mockable functions with ugly macros), but it actually
works, and is portable across multiple compilers and architectures.