summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-24Merge remote-tracking branch 'public/bug7189_tentative'Nick Mathewson
2012-10-24Only disable TLS tickets when being/acting as a server.Nick Mathewson
Fix for bug 7189.
2012-10-24Fix instructions for using Tor with gcovNick Mathewson
It seems as if our new build system broke gcov for me. I've tried to fix doc/HACKING to describe what I needed to do in order to make it work again.
2012-10-23Use the same changes file for bug7191 as in 0.2.[23]Nick Mathewson
2012-10-23Merge remote-tracking branch 'andrea/bug7191_v2'Nick Mathewson
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
This is an "ours" merge; we want a separate fix for this bug (bug7191) in master. Rather than catching the two failing cases, we need to make them not fail.
2012-10-23Make unit test for bug7191 work with new smartlist_new() nameNick Mathewson
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2012-10-23Add some unit tests for smartlist_bsearch_idx() on short listsAndrea Shepard
Conflicts: src/test/test_containers.c
2012-10-23Add a changes file for bug 7191.Nick Mathewson
2012-10-23Fix binary search on lists of 0 or 1 element.Nick Mathewson
The implementation we added has a tendency to crash with lists of 0 or one element. That can happen if we get a consensus vote, v2 consensus, consensus, or geoip file with 0 or 1 element. There's a DOS opportunity there that authorities could exploit against one another, and which an evil v2 authority could exploit against anything downloading v2 directory information.. This fix is minimalistic: It just adds a special-case for 0- and 1-element lists. For 0.2.4 (the current alpha series) we'll want a better patch. This is bug 7191; it's a fix on 0.2.0.10-alpha.
2012-10-23Add some unit tests for smartlist_bsearch_idx() on short listsAndrea Shepard
2012-10-23Rewrite smartlist_bsearch_idx() to not be broken for lists of length zero or ↵Andrea Shepard
one (fixes bug 7191)
2012-10-23Merge branch 'maint-0.2.3'Roger Dingledine
2012-10-23Roll enh6876 into Changelog for 0.2.4.4 alpha, which had the change but not ↵Nick Mathewson
the entry.
2012-10-23Merge remote-tracking branch 'linus/enh6876_changes_file'Nick Mathewson
2012-10-23Let 0.2.3 clients exit to internal addresses if they wantRoger Dingledine
Clients now consider the ClientRejectInternalAddresses config option when using a microdescriptor consensus stanza to decide whether an exit relay would allow exiting to an internal address. Fixes bug 7190; bugfix on 0.2.3.1-alpha.
2012-10-23fix typoRoger Dingledine
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-10-23Fix parse_short_policy (bug 7192.)Nick Mathewson
Our implementation of parse_short_policy was screwed up: it would ignore the last character of every short policy. Obviously, that's broken. This patch fixes the busted behavior, and adds a bunch of unit tests to make sure the rest of that function is okay. Fixes bug 7192; fix on 0.2.3.1-alpha.
2012-10-22add a unit test to expose bug 7192Roger Dingledine
2012-10-22Fix more madness from the split_circuitbuild mergeNick Mathewson
2012-10-22Kill extraneous x from 907db008ab0007f0a02Nick Mathewson
Looks like clang doesn't complain about this kind of thing. Spotted by Andrea. Bug not in any released version.
2012-10-22Merge branch 'split_circuitbuild'Nick Mathewson
Conflicts: src/or/circuitbuild.c There was a huge-looking conflict in circuitbuild.c, but the only change that had been made to circuitbuild.c since I forked off the split_circuitbuild branch was 17442560c44e8093f9a. So I took the split_circuitbuild version of the conflicting part, and manually re-applied the change from 17442560c44e8093f9a..
2012-10-22Add changes file for ticket 6876 missing from 0.2.4.4-alpha ChangeLog.Linus Nordberg
2012-10-22Possessive "it's" → "its" in .nsi files.David Fifield
2012-10-21bump to 0.2.4.4-alpha-devRoger Dingledine
2012-10-20bump to 0.2.4.4-alphator-0.2.4.4-alphaRoger Dingledine
2012-10-20fold in changes files for upcoming 0.2.4.4-alphaRoger Dingledine
2012-10-20forward-port the 0.2.3.23-rc changelogRoger Dingledine
2012-10-19Merge branch 'block_renegotiate_024'Nick Mathewson
2012-10-19Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
This is an "ours" commit ; I'm merging a separate version of the block-renegotiate patch into 0.2.4.
2012-10-19Merge branch 'block_renegotiate_023' into maint-0.2.3Nick Mathewson
2012-10-19Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-10-19Merge branch 'bug7149' into maint-0.2.3Nick Mathewson
2012-10-19Don't serve or accept v2 HS descs over a DirPortRobert Ransom
(changes file tweaked by nickm)
2012-10-19Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-10-19Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2012-10-19Disable TLS Session Tickets, which we were apparently getting for freeNick Mathewson
OpenSSL 1.0.0 added an implementation of TLS session tickets, a "feature" that let session resumption occur without server-side state by giving clients an encrypted "ticket" that the client could present later to get the session going again with the same keys as before. OpenSSL was giving the keys to decrypt these tickets the lifetime of the SSL contexts, which would have been terrible for PFS if we had long-lived SSL contexts. Fortunately, we don't. Still, it's pretty bad. We should also drop these, since our use of the extension stands out with our non-use of session cacheing. Found by nextgens. Bugfix on all versions of Tor when built with openssl 1.0.0 or later. Fixes bug 7139.
2012-10-18Factor out common parts of channel_tls_connect() and ↵Andrea Shepard
channel_tls_handle_incoming(); fixes get_remote_addr problem with incoming connections for bug 7112
2012-10-17Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson
Failure to do so left us open to a remotely triggerable assertion failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by "some guy from France". This patch is a forward-port to 0.2.4, to work with the new channel logic.
2012-10-17Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson
Failure to do so left us open to a remotely triggerable assertion failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by "some guy from France".
2012-10-17Fix a bug in channel_dump_statisticsNick Mathewson
We were calling channel_get_actual_remote_descr() before we used the output of a previous channel_get_canonical_remote_descr(), thus invalidating its output.
2012-10-17Document lifespan of return values of the _remote_descr() funcsNick Mathewson
2012-10-17Restore the 'address' value of tunneled connectionsNick Mathewson
When we merged the channel code, we made the 'address' field of linked directory connections created with begindir (and their associated edge connections) contain an address:port string, when they should only have contained the address part. This patch also tweaks the interface to the get_descr method of channels so that it takes a set of flags rather than a single flag.
2012-10-17Fix for bug 7112 (spewing complaints from tor_addr_is_internal)Nick Mathewson
In 4768c0efe3e9471cc367c3740d1a4ba0ab79626c (not in any released version of Tor), we removed a little block of code that set the addr field of an exit connection used in making a tunneled directory request. Turns out that wasn't right.
2012-10-17Document return value of channel_get_addr_if_possibleNick Mathewson
2012-10-17Remove changes/bug7129Nick Mathewson
Our convention is that we use the changelog to note release-to-release changes; we don't need to add changelog entries for bugs that didn't appear in any released version of Tor. (By convention, we sometimes say "this bug does not appear in any released version of Tor" or words to that effect in the commit message so that when Roger goes to make sure the changelog is right, he knows not to expect a changelog entry for that part.)
2012-10-17Add changes file for bug 7129Andrea Shepard
2012-10-17Use LD_PROTOCOL rather than LD_BUG to warn about bogus reason codes that ↵Andrea Shepard
originated remotely in circuit_end_reason_to_control_string()