summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2012-11-02In the unit tests, use "test_eq_ptr" and "test_neq_ptr" consistentlyNick Mathewson
This is part of what's needed to build without warnings on mingw64: it was warning about the cast from void* to long that happened in the places we were using test_{n,}eq on pointers. The alternative here would have been to broaden tt_int_op to accept a long long or an intptr_t, but that's less correct (since pointers aren't integers), and would hurt the portability of tinytest a little. Fixes part of 7260.
2012-11-02Add a TOR_SOCKET_T_FORMAT construction for logging sockets.Nick Mathewson
We need this since win64 has a 64-bit SOCKET type. Based on a patch from yayooo for 7260, forward-ported to 0.2.4.
2012-11-02Add a PID_T_FORMAT for writing pids to logsNick Mathewson
This is based on code by yayooo for 7260, but: - It allows for SIZEOF_PID_T == SIZEOF_SHORT - It addresses some additional cases where we weren't getting any warnings only because we were casting pid_t to int.
2012-11-02Remove an unused variable; part of mingw64 patch from yayoooNick Mathewson
2012-11-02Compile (with warnings) with mingw64Nick Mathewson
Patch from yayooo for bug 7260, forward-ported to 0.2.4.
2012-11-02Avoid c99 designated initializers in circuitmux_ewma.cNick Mathewson
We still want to build on compilers w/o c99 support, such as (notoriously, shamefully) MSVC. So I'm commenting out the designated initializers in circuitmux_ewma.c. The alternative would have been to use some kind of macros to use designated initializers only when they're supported, but that's error-prone, and can lead to code having different meanings under different compilers. Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem.
2012-11-01Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilationNick Mathewson
Apparently winnt.h defines a different SLIST_ENTRY of its own. Bug not in any version of Tor.
2012-10-31Fix whitespaceNick Mathewson
2012-10-30Add a copy of the queue(3) manpage to the git repository.Nick Mathewson
See 7105
2012-10-30Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard
2012-10-28Fix undefined reference to libm functions linking tor-fw-helperAnthony G. Basile
When configuring tor without upnp support, ie ./configure --disable-upnp, tor-fw-helper fails to link with undefined references to `ceil' and `log'. This if fixed by linking to libm. X-Gentoo-Bug: 435040 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=435040 Reported-by: Alexandre <alexandre.cortes@outlook.com> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-10-27Merge remote-tracking branch 'asn/bug6832'Nick Mathewson
2012-10-26bump to 0.2.4.5-alpha-devRoger Dingledine
2012-10-26touch-upsRoger Dingledine
2012-10-25Bump the version number to 0.2.4.5-alphaNick Mathewson
(For real this time. It turns out that 4 and 5 are different numbers.)
2012-10-25Bump version to 0.2.4.5-alphaNick Mathewson
2012-10-25Merge branch 'link_negotiation_assert_024'Nick Mathewson
2012-10-24Change changes file and comment for 7189, for making it 0.2.4-only for nowNick Mathewson
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-23Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson
If we completed the handshake for the v2 link protocol but wound up negotiating the wong protocol version, we'd become so confused about what part of the handshake we were in that we'd promptly die with an assertion. This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha. All servers running that version or later should really upgrade. Bug and fix from "some guy from France." I tweaked his code slightly to make it log the IP of the offending node, and to forward-port it to 0.2.4.
2012-10-23Merge remote-tracking branch 'andrea/bug7191_v2'Nick Mathewson
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-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-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-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-19Merge branch 'block_renegotiate_024'Nick Mathewson
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-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.