]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoAllow reloading torrc and writing to router-stability
Nick Mathewson [Wed, 16 Apr 2014 19:54:45 +0000 (15:54 -0400)] 
Allow reloading torrc and writing to router-stability

11 years agoUse SCMP_CMP_MASKED_EQ to allow flags, not force them
Nick Mathewson [Wed, 16 Apr 2014 19:17:23 +0000 (15:17 -0400)] 
Use SCMP_CMP_MASKED_EQ to allow flags, not force them

Older versions of Libevent are happy to open SOCK_DGRAM sockets
non-cloexec and non-nonblocking, and then set those flags
afterwards. It's nice to be able to allow a flag to be on or off in
the sandbox without having to enumerate all its values.

Also, permit PF_INET6 sockets. (D'oh!)

11 years agoAdd a couple of missing renames so the server sandbox works again
Nick Mathewson [Wed, 16 Apr 2014 19:15:31 +0000 (15:15 -0400)] 
Add a couple of missing renames so the server sandbox works again

11 years agoGet Libevent's PRNG functioning under the linux sandbox
Nick Mathewson [Wed, 16 Apr 2014 18:54:39 +0000 (14:54 -0400)] 
Get Libevent's PRNG functioning under the linux sandbox

Libevent uses an arc4random implementation (I know, I know) to
generate DNS transaction IDs and capitalization.  But it liked to
initialize it either with opening /dev/urandom (which won't work
under the sandbox if it doesn't use the right pointer), or with
sysctl({CTL_KERN,KERN_RANDOM,RANDOM_UUIC}).  To make _that_ work, we
were permitting sysctl unconditionally.  That's not such a great
idea.

Instead, we try to initialize the libevent PRNG _before_ installing
the sandbox, and make sysctl always fail with EPERM under the
sandbox.

11 years agoMake sure everything using an interned string is preceded by a log
Nick Mathewson [Wed, 16 Apr 2014 17:17:09 +0000 (13:17 -0400)] 
Make sure everything using an interned string is preceded by a log

(It's nice to know what we were about to rename before we died from
renaming it.)

11 years agoIntroduce arg-counting macros to wrap seccomp_rule_add()
Nick Mathewson [Wed, 16 Apr 2014 16:59:33 +0000 (12:59 -0400)] 
Introduce arg-counting macros to wrap seccomp_rule_add()

The compiler doesn't warn about this code:
       rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 1,
           SCMP_CMP(0, SCMP_CMP_EQ, AT_FDCWD),
           SCMP_CMP(1, SCMP_CMP_EQ, param->value),
           SCMP_CMP(2, SCMP_CMP_EQ, O_RDONLY|...));
but note that the arg_cnt argument above is only 1.  This means that
only the first filter (argument 0 == AT_FDCWD) is actually checked!

This patch also fixes the above error in the openat() filter.
Earlier I fixed corresponding errors in filters for rename() and
mprotect().

11 years agoFix sandbox protection for rename
Nick Mathewson [Wed, 16 Apr 2014 16:50:24 +0000 (12:50 -0400)] 
Fix sandbox protection for rename

(We were only checking the first parameter of each rename call.)

11 years agoUpgrade warning about missing interned string for sandbox
Nick Mathewson [Wed, 16 Apr 2014 16:48:56 +0000 (12:48 -0400)] 
Upgrade warning about missing interned string for sandbox

11 years agoHave sandbox string protection include multi-valued parmeters.
Nick Mathewson [Wed, 16 Apr 2014 16:45:34 +0000 (12:45 -0400)] 
Have sandbox string protection include multi-valued parmeters.

11 years agoClean up sandbox structures a bit
Nick Mathewson [Wed, 16 Apr 2014 16:24:08 +0000 (12:24 -0400)] 
Clean up sandbox structures a bit

Drop pindex,pindex2 as unused.

Admit a type to avoid using a void*

11 years agoAdd missing rename function for non-linux platforms
Nick Mathewson [Fri, 11 Apr 2014 07:06:05 +0000 (03:06 -0400)] 
Add missing rename function for non-linux platforms

11 years agoDrop 'fr' parameter from sandbox code.
Nick Mathewson [Fri, 11 Apr 2014 07:04:16 +0000 (03:04 -0400)] 
Drop 'fr' parameter from sandbox code.

Appearently, the majority of the filenames we pass to
sandbox_cfg_allow() functions are "freeable right after". So, consider
_all_ of them safe-to-steal, and add a tor_strdup() in the few cases
that aren't.

(Maybe buggy; revise when I can test.)

11 years agoRemove nonsensical exec permission from sandbox code.
Nick Mathewson [Fri, 11 Apr 2014 06:40:15 +0000 (02:40 -0400)] 
Remove nonsensical exec permission from sandbox code.

11 years agoAdd 'rename' to the sandboxed syscalls
Nick Mathewson [Fri, 28 Mar 2014 07:51:50 +0000 (03:51 -0400)] 
Add 'rename' to the sandboxed syscalls

(If we don't restrict rename, there's not much point in restricting
open, since an attacker could always use rename to make us open
whatever they want.)

11 years agoOnly intern one copy of each magic string for the sandbox
Nick Mathewson [Fri, 28 Mar 2014 06:10:19 +0000 (02:10 -0400)] 
Only intern one copy of each magic string for the sandbox

If we intern two copies of a string, later calls to
sandbox_intern_string will give the wrong one sometimes.

11 years agoFix some initial sandbox issues.
Nick Mathewson [Fri, 28 Mar 2014 05:52:08 +0000 (01:52 -0400)] 
Fix some initial sandbox issues.

Allow files that weren't in the list; Allow the _sysctl syscall;
allow accept4 with CLOEXEC and NONBLOCK.

11 years agoOnly expose clean_backtrace() if we'll implement it
Nick Mathewson [Thu, 17 Apr 2014 02:00:13 +0000 (22:00 -0400)] 
Only expose clean_backtrace() if we'll implement it

Fixes windows compilation; bug not in any released Tor.

Bugfix on cc9e86db.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Wed, 16 Apr 2014 19:37:19 +0000 (15:37 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Wed, 16 Apr 2014 18:57:14 +0000 (14:57 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoremove note about dannenberg; it has upgraded.
Nick Mathewson [Wed, 16 Apr 2014 18:56:49 +0000 (14:56 -0400)] 
remove note about dannenberg; it has upgraded.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Wed, 16 Apr 2014 17:32:20 +0000 (13:32 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoUpdate the authority signing key blacklist
Nick Mathewson [Wed, 16 Apr 2014 17:31:40 +0000 (13:31 -0400)] 
Update the authority signing key blacklist

Now it only has dannenberg

11 years agoMerge remote-tracking branch 'public/bug11465'
Nick Mathewson [Wed, 16 Apr 2014 00:55:28 +0000 (20:55 -0400)] 
Merge remote-tracking branch 'public/bug11465'

11 years agoAnswer a question in a comment; fix a wide line.
Nick Mathewson [Wed, 16 Apr 2014 00:52:31 +0000 (20:52 -0400)] 
Answer a question in a comment; fix a wide line.

11 years agoFix compiler warning on test_status.c
Nick Mathewson [Tue, 15 Apr 2014 19:19:41 +0000 (15:19 -0400)] 
Fix compiler warning on test_status.c

11 years agoadd changes file for 11507
Nick Mathewson [Tue, 15 Apr 2014 19:03:49 +0000 (15:03 -0400)] 
add changes file for 11507

11 years agoUplift status.c unit test coverage with new test cases and macros.
dana koch [Tue, 15 Apr 2014 12:20:34 +0000 (22:20 +1000)] 
Uplift status.c unit test coverage with new test cases and macros.

A new set of unit test cases are provided, as well as introducing
an alternative paradigm and macros to support it. Primarily, each test
case is given its own namespace, in order to isolate tests from each
other. We do this by in the usual fashion, by appending module and
submodule names to our symbols. New macros assist by reducing friction
for this and other tasks, like overriding a function in the global
namespace with one in the current namespace, or declaring integer
variables to assist tracking how many times a mock has been called.

A set of tests for a small-scale module has been included in this
commit, in order to highlight how the paradigm can be used. This
suite gives 100% coverage to status.c in test execution.

11 years agoMerge remote-tracking branch 'public/bug11513_024'
Nick Mathewson [Tue, 15 Apr 2014 18:54:25 +0000 (14:54 -0400)] 
Merge remote-tracking branch 'public/bug11513_024'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 15 Apr 2014 18:52:12 +0000 (14:52 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Tue, 15 Apr 2014 18:51:19 +0000 (14:51 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
src/or/circuituse.c

11 years agoMerge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
Nick Mathewson [Tue, 15 Apr 2014 18:48:00 +0000 (14:48 -0400)] 
Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3

11 years agoDon't send uninitialized stack to the controller and say it's a date.
Nick Mathewson [Tue, 15 Apr 2014 01:51:30 +0000 (21:51 -0400)] 
Don't send uninitialized stack to the controller and say it's a date.

Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Mon, 14 Apr 2014 22:00:54 +0000 (18:00 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 14 Apr 2014 22:00:38 +0000 (18:00 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
src/or/routerlist.h

11 years agoMerge branch 'bug11464_023_squashed' into maint-0.2.3
Nick Mathewson [Mon, 14 Apr 2014 21:59:01 +0000 (17:59 -0400)] 
Merge branch 'bug11464_023_squashed' into maint-0.2.3

11 years agoTweak changes file and comment dates.
Nick Mathewson [Mon, 14 Apr 2014 21:58:49 +0000 (17:58 -0400)] 
Tweak changes file and comment dates.

11 years agoFill in the list of blacklisted signing keys.
Nick Mathewson [Mon, 14 Apr 2014 20:03:53 +0000 (16:03 -0400)] 
Fill in the list of blacklisted signing keys.

I used a list of certificate files from arma, and a little script,
both at 11464.

11 years agoCode to blacklist authority signing keys
Nick Mathewson [Fri, 11 Apr 2014 14:22:14 +0000 (10:22 -0400)] 
Code to blacklist authority signing keys

(I need a list of actual signing keys to blacklist.)

11 years agoNew sort order for server choice of ciphersuites.
Nick Mathewson [Mon, 14 Apr 2014 18:10:05 +0000 (14:10 -0400)] 
New sort order for server choice of ciphersuites.

Back in 175b2678, we allowed servers to recognize clients who are
telling them the truth about their ciphersuites, and select the best
cipher from on that list. This implemented the server side of proposal
198.

In bugs 11492, 11498, and 11499, cypherpunks found a bunch of mistakes
and omissions and typos in the UNRESTRICTED_SERVER_CIPHER_LIST we had.
In #11513, I found a couple more.

Rather than try to hand-edit this list, I wrote a short python script
to generate our ciphersuite preferences from the openssl headers.

The new rules are:
  * Require forward secrecy.
  * Require RSA (since our servers only configure RSA keys)
  * Require AES or 3DES. (This means, reject RC4, DES, SEED, CAMELLIA,
    and NULL.)
  * No export ciphersuites.

Then:
  * Prefer AES to 3DES.
  * If both suites have the same cipher, prefer ECDHE to DHE.
  * If both suites have the same DHE group type, prefer GCM to CBC.
  * If both suites have the same cipher mode, prefer SHA384 to SHA256
    to SHA1.
  * If both suites have the same digest, prefer AES256 to AES128.

11 years agoMerge remote-tracking branch 'asn/bug11486'
Nick Mathewson [Sun, 13 Apr 2014 01:42:45 +0000 (21:42 -0400)] 
Merge remote-tracking branch 'asn/bug11486'

11 years agoAdd another unit test for parse_bridge_line().
George Kadianakis [Fri, 11 Apr 2014 18:06:40 +0000 (21:06 +0300)] 
Add another unit test for parse_bridge_line().

11 years agochanges file for 11465
Nick Mathewson [Thu, 10 Apr 2014 19:51:18 +0000 (15:51 -0400)] 
changes file for 11465

11 years agoLog a backtrace when the sandbox finds a failure
Nick Mathewson [Thu, 10 Apr 2014 19:44:52 +0000 (15:44 -0400)] 
Log a backtrace when the sandbox finds a failure

This involves some duplicate code between backtrace.c and sandbox.c,
but I don't see a way around it: calling more functions would mean
adding more steps to our call stack, and running clean_backtrace()
against the wrong point on the stack.

11 years agoMake the sandbox code allow the writev() syscall.
Nick Mathewson [Thu, 10 Apr 2014 19:08:28 +0000 (15:08 -0400)] 
Make the sandbox code allow the writev() syscall.

Tor doesn't use it directly, but the glibc backtrace-to-fd code does

11 years agoDemote "we stalled too much while trying to write" message to INFO
Nick Mathewson [Wed, 9 Apr 2014 15:34:00 +0000 (11:34 -0400)] 
Demote "we stalled too much while trying to write" message to INFO

Resolves ticket 5286.

11 years agoFix a dumb C bug in the unit tests for 9841
Nick Mathewson [Wed, 9 Apr 2014 13:20:25 +0000 (09:20 -0400)] 
Fix a dumb C bug in the unit tests for 9841

Fixes bug 11460; bug only affects unit tests and is not in any
released version of Tor.

11 years agoMerge remote-tracking branch 'public/bug10431'
Nick Mathewson [Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)] 
Merge remote-tracking branch 'public/bug10431'

11 years agonote a missing word
Roger Dingledine [Wed, 9 Apr 2014 05:01:52 +0000 (01:01 -0400)] 
note a missing word

11 years agoMove and combine some 0.2.5.4-alpha changelog sections.
Nick Mathewson [Wed, 9 Apr 2014 00:55:25 +0000 (20:55 -0400)] 
Move and combine some 0.2.5.4-alpha changelog sections.

11 years agoOops, actually add the changelog entries, lightly categorized
Nick Mathewson [Wed, 9 Apr 2014 00:48:25 +0000 (20:48 -0400)] 
Oops, actually add the changelog entries, lightly categorized

11 years agoMerge remote-tracking branch 'public/update_ciphers_ff28'
Nick Mathewson [Wed, 9 Apr 2014 00:43:21 +0000 (20:43 -0400)] 
Merge remote-tracking branch 'public/update_ciphers_ff28'

11 years agoStart work on the changelog for 0.2.5.4-alpha
Nick Mathewson [Wed, 9 Apr 2014 00:34:23 +0000 (20:34 -0400)] 
Start work on the changelog for 0.2.5.4-alpha

This commit does nothing other than pull the changes/* files into
ChangeLog, sorted by declared type.  I haven't comined any entries or
vetted anything yet.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Wed, 9 Apr 2014 00:30:30 +0000 (20:30 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'public/bug11437_024' into maint-0.2.4
Nick Mathewson [Wed, 9 Apr 2014 00:29:24 +0000 (20:29 -0400)] 
Merge remote-tracking branch 'public/bug11437_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug11426'
Nick Mathewson [Tue, 8 Apr 2014 20:46:34 +0000 (16:46 -0400)] 
Merge remote-tracking branch 'public/bug11426'

11 years agoMerge branch 'bug2454_025_squashed'
Nick Mathewson [Tue, 8 Apr 2014 19:37:15 +0000 (15:37 -0400)] 
Merge branch 'bug2454_025_squashed'

11 years agoCheck for new IP addr after circuit liveliness returns
Matthew Finkel [Tue, 1 Apr 2014 21:30:20 +0000 (17:30 -0400)] 
Check for new IP addr after circuit liveliness returns

When we successfully create a usable circuit after it previously
timed out for a certain amount of time, we should make sure that
our public IP address hasn't changed and update our descriptor.

11 years agoMove existing policy tests from test.c to new test_policy.c
Nick Mathewson [Tue, 8 Apr 2014 18:14:12 +0000 (14:14 -0400)] 
Move existing policy tests from test.c to new test_policy.c

11 years agoRemove unused extern decl for a nonexistent test suite
Nick Mathewson [Tue, 8 Apr 2014 18:10:59 +0000 (14:10 -0400)] 
Remove unused extern decl for a nonexistent test suite

11 years agoMerge branch 'bug7952_final'
Nick Mathewson [Tue, 8 Apr 2014 17:55:02 +0000 (13:55 -0400)] 
Merge branch 'bug7952_final'

Conflicts:
src/test/include.am
src/test/test.c

11 years agoMaking entire exit policy available to Tor controller.
rl1987 [Fri, 23 Aug 2013 18:06:42 +0000 (21:06 +0300)] 
Making entire exit policy available to Tor controller.

11 years agoMerge remote-tracking branch 'public/bug4241'
Nick Mathewson [Tue, 8 Apr 2014 16:41:03 +0000 (12:41 -0400)] 
Merge remote-tracking branch 'public/bug4241'

11 years agoMerge remote-tracking branch 'public/bug9841_025'
Nick Mathewson [Tue, 8 Apr 2014 16:06:03 +0000 (12:06 -0400)] 
Merge remote-tracking branch 'public/bug9841_025'

11 years agoUpdate ciphers.inc to match ff28
Nick Mathewson [Tue, 8 Apr 2014 15:31:48 +0000 (11:31 -0400)] 
Update ciphers.inc to match ff28

The major changes are to re-order some ciphers, to drop the ECDH suites
(note: *not* ECDHE: ECDHE is still there), to kill off some made-up
stuff (like the SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA suite), to drop
some of the DSS suites... *and* to enable the ECDHE+GCM ciphersuites.

This change is autogenerated by get_mozilla_ciphers.py from
Firefox 28 and OpenSSL 1.0.1g.

Resolves ticket 11438.

11 years agoTeach the get_mozilla_ciphers.py script to parse recent firefoxen
Nick Mathewson [Tue, 8 Apr 2014 07:19:38 +0000 (03:19 -0400)] 
Teach the get_mozilla_ciphers.py script to parse recent firefoxen

11 years agoFix a small memory leak when resolving PTR addresses
Nick Mathewson [Tue, 8 Apr 2014 03:29:47 +0000 (23:29 -0400)] 
Fix a small memory leak when resolving PTR addresses

Fixes bug 11437; bugfix on 0.2.4.7-alpha.

Found by coverity; this is CID 1198198.

11 years agoFix some harmless/untriggerable memory leaks found by coverity
Nick Mathewson [Tue, 8 Apr 2014 03:20:13 +0000 (23:20 -0400)] 
Fix some harmless/untriggerable memory leaks found by coverity

11 years agoMerge remote-tracking branch 'public/bug10363_024_squashed'
Nick Mathewson [Tue, 8 Apr 2014 03:03:04 +0000 (23:03 -0400)] 
Merge remote-tracking branch 'public/bug10363_024_squashed'

11 years agoAnother 10363 instance -- this one in the eventdns.c code
Nick Mathewson [Wed, 11 Dec 2013 20:15:21 +0000 (15:15 -0500)] 
Another 10363 instance -- this one in the eventdns.c code

11 years agoAnother 10363 instance: this one in tor_memmem fallback code
Nick Mathewson [Wed, 11 Dec 2013 20:14:43 +0000 (15:14 -0500)] 
Another 10363 instance: this one in tor_memmem fallback code

11 years agoFix undefined behavior with pointer addition in channeltls.c
Nick Mathewson [Wed, 11 Dec 2013 19:45:48 +0000 (14:45 -0500)] 
Fix undefined behavior with pointer addition in channeltls.c

In C, it's a bad idea to do this:

   char *cp = array;
   char *end = array + array_len;

   /* .... */

   if (cp + 3 >= end) { /* out of bounds */ }

because cp+3 might be more than one off the end of the array, and
you are only allowed to construct pointers to the array elements,
and to an element one past the end.  Instead you have to say

   if (cp - array + 3 >= array_len) { /* ... */ }

or something like that.

This patch fixes two of these: one in process_versions_cell
introduced in 0.2.0.10-alpha, and one in process_certs_cell
introduced in 0.2.3.6-alpha.  These are both tracked under bug
10363. "bobnomnom" found and reported both. See also 10313.

In our code, this is likely to be a problem as we used it only if we
get a nasty allocator that makes allocations end close to (void*)-1.
But it's best not to have to worry about such things at all, so
let's just fix all of these we can find.

11 years agoMerge branch 'bug9665_redux'
Nick Mathewson [Tue, 8 Apr 2014 02:20:13 +0000 (22:20 -0400)] 
Merge branch 'bug9665_redux'

11 years agoChanges file for bug9665
Nick Mathewson [Tue, 8 Apr 2014 02:19:56 +0000 (22:19 -0400)] 
Changes file for bug9665

11 years agoFor missing transport, say "PT_MISSING" not "NO_ROUTE"
Nick Mathewson [Mon, 7 Apr 2014 17:44:22 +0000 (13:44 -0400)] 
For missing transport, say "PT_MISSING" not "NO_ROUTE"

11 years agoForward-port bug9665 fix to work with our fix for 11069
Nick Mathewson [Mon, 7 Apr 2014 17:41:07 +0000 (13:41 -0400)] 
Forward-port bug9665 fix to work with our fix for 11069

11 years agoFix bug9665
Fábio J. Bertinatto [Tue, 5 Nov 2013 02:50:16 +0000 (00:50 -0200)] 
Fix bug9665

11 years agoMake csiphash use the proper endian-converter on solaris
Nick Mathewson [Mon, 7 Apr 2014 17:07:14 +0000 (13:07 -0400)] 
Make csiphash use the proper endian-converter on solaris

fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was
introduced.

11 years agoMerge remote-tracking branch 'public/bug9650'
Nick Mathewson [Sat, 5 Apr 2014 18:53:48 +0000 (14:53 -0400)] 
Merge remote-tracking branch 'public/bug9650'

11 years agoMerge remote-tracking branch 'public/bug10801_024'
Nick Mathewson [Sat, 5 Apr 2014 18:50:57 +0000 (14:50 -0400)] 
Merge remote-tracking branch 'public/bug10801_024'

Conflicts:
src/common/address.c
src/or/config.c

11 years agoMake tor_addr_port_parse handle portless IPv6 addresses correctly.
Nick Mathewson [Sat, 5 Apr 2014 18:41:37 +0000 (14:41 -0400)] 
Make tor_addr_port_parse handle portless IPv6 addresses correctly.

(Not a bugfix on any Tor release; before 10801_024, it didn't handle
portless addresses at all.)

11 years agoAdd a test for default/port conflicts in tor_addr_port_parse
Nick Mathewson [Sat, 5 Apr 2014 18:18:39 +0000 (14:18 -0400)] 
Add a test for default/port conflicts in tor_addr_port_parse

11 years agoProtocol_Warn when a rendezvous cookie is used twice.
Nick Mathewson [Fri, 4 Apr 2014 16:17:16 +0000 (12:17 -0400)] 
Protocol_Warn when a rendezvous cookie is used twice.

11 years agoTest for circuit_set_rend_token(.,.,NULL)
Nick Mathewson [Fri, 4 Apr 2014 16:06:54 +0000 (12:06 -0400)] 
Test for circuit_set_rend_token(.,.,NULL)

11 years agoMerge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025
Nick Mathewson [Fri, 4 Apr 2014 16:05:51 +0000 (12:05 -0400)] 
Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

11 years agoFix to 9841 fix: setting a token to NULL should clear it
Nick Mathewson [Fri, 4 Apr 2014 16:01:49 +0000 (12:01 -0400)] 
Fix to 9841 fix: setting a token to NULL should clear it

Found by testing with chutney.  The old behavior was "fail an
assertion", which obviously isn't optimal.

Bugfix on 8b9a2cb68b290e550695124d7ef0511225b451d5; bug not in any
released version.

11 years agoFix make_socket_reusable() on windows. Bug not in any released Tor
Nick Mathewson [Thu, 3 Apr 2014 01:11:45 +0000 (21:11 -0400)] 
Fix make_socket_reusable() on windows. Bug not in any released Tor

11 years agoMerge remote-tracking branch 'public/bug10081'
Nick Mathewson [Wed, 2 Apr 2014 19:45:20 +0000 (15:45 -0400)] 
Merge remote-tracking branch 'public/bug10081'

11 years agoUnit tests for connection_edge_process_resolved_cell
Nick Mathewson [Wed, 2 Apr 2014 17:38:50 +0000 (13:38 -0400)] 
Unit tests for connection_edge_process_resolved_cell

Also rename a function to be more accurate (resolve->resolved)

11 years agoTests for resolved_cell_parse
Nick Mathewson [Wed, 2 Apr 2014 15:49:18 +0000 (11:49 -0400)] 
Tests for resolved_cell_parse

11 years agoLook at all of a RESOLVED cell; not just the first answer.
Nick Mathewson [Fri, 28 Mar 2014 02:24:48 +0000 (22:24 -0400)] 
Look at all of a RESOLVED cell; not just the first answer.

Also, stop accepting the old kind of RESOLVED cells with no TTL
fields; they haven't been sent since 0.1.1.6-alpha.

This patch won't work without the fix to #10468 -- it will break
DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t.

11 years agoDrop MAX_REND_FAILURES to 8
Nick Mathewson [Wed, 2 Apr 2014 19:36:13 +0000 (15:36 -0400)] 
Drop MAX_REND_FAILURES to 8

11 years agoExtract code to handle RESOLVED cells
Nick Mathewson [Thu, 27 Mar 2014 23:58:06 +0000 (19:58 -0400)] 
Extract code to handle RESOLVED cells

No other changes have been made; only code has been moved.

11 years agoMerge remote-tracking branch 'public/bug11278'
Nick Mathewson [Wed, 2 Apr 2014 01:56:49 +0000 (21:56 -0400)] 
Merge remote-tracking branch 'public/bug11278'

11 years agoMerge remote-tracking branch 'public/bug10468_024'
Nick Mathewson [Wed, 2 Apr 2014 01:50:55 +0000 (21:50 -0400)] 
Merge remote-tracking branch 'public/bug10468_024'

11 years agoMerge remote-tracking branch 'public/bug4645'
Nick Mathewson [Wed, 2 Apr 2014 01:49:01 +0000 (21:49 -0400)] 
Merge remote-tracking branch 'public/bug4645'

Conflicts:
src/or/dirserv.c

11 years agoAdd one more missing heck on bug4645 fixes
Nick Mathewson [Wed, 2 Apr 2014 01:10:14 +0000 (21:10 -0400)] 
Add one more missing heck on bug4645 fixes

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Wed, 2 Apr 2014 01:00:30 +0000 (21:00 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge branch 'bug9213_doc_024' into maint-0.2.4
Nick Mathewson [Wed, 2 Apr 2014 00:59:13 +0000 (20:59 -0400)] 
Merge branch 'bug9213_doc_024' into maint-0.2.4

11 years agoFix documentation of torrc search order
Nick Mathewson [Thu, 27 Mar 2014 18:58:46 +0000 (14:58 -0400)] 
Fix documentation of torrc search order

We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd6c06d43ff3af5acd8135bd8b577bc3, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.

11 years agoMerge remote-tracking branch 'public/bug9870'
Nick Mathewson [Wed, 2 Apr 2014 00:48:15 +0000 (20:48 -0400)] 
Merge remote-tracking branch 'public/bug9870'

Conflicts:
src/or/config.c