Roger Dingledine
acc54d32b6
Merge branch 'maint-0.2.1' into release-0.2.1
2011-05-13 23:37:50 -04:00
Nick Mathewson
1f678277a1
Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
2011-05-12 19:20:40 -04:00
Nick Mathewson
13847b8db6
Fix crash when read_file_to_string() fails in SAVECONF
...
The new behavior is to try to rename the old file if there is one there
that we can't read. In all likelihood, that will fail too, but at least
we tried, and at least it won't crash.
2011-05-11 22:05:41 -04:00
Nick Mathewson
59f9097d5c
Hand-conversion and audit phase of memcmp transition
...
Here I looked at the results of the automated conversion and cleaned
them up as follows:
If there was a tor_memcmp or tor_memeq that was in fact "safe"[*] I
changed it to a fast_memcmp or fast_memeq.
Otherwise if there was a tor_memcmp that could turn into a
tor_memneq or tor_memeq, I converted it.
This wants close attention.
[*] I'm erring on the side of caution here, and leaving some things
as tor_memcmp that could in my opinion use the data-dependent
fast_memcmp variant.
2011-05-11 16:12:51 -04:00
Nick Mathewson
db7b2a33ee
Automated conversion of memcmp to tor_memcmp/tor_mem[n]eq
...
This commit is _exactly_ the result of
perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch]
perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch]
git checkout src/common/di_ops.[ch]
git checkout src/or/test.c
git checkout src/common/test.h
2011-05-11 16:12:51 -04:00
Nick Mathewson
1d703ed22b
Add a "di_ops.h" include to util.h
2011-05-11 16:12:51 -04:00
Nick Mathewson
4b19730c82
Add a data-independent variant of memcmp and a d-i memeq function.
...
The tor_memcmp code is by Robert Ransom, and the tor_memeq code is
by me. Both incorporate some ideas from DJB's stuff.
2011-05-11 16:12:33 -04:00
Roger Dingledine
c783b828ca
Merge branch 'maint-0.2.1' into release-0.2.1
2011-05-10 23:05:03 -04:00
Roger Dingledine
e7b10e5ecf
Update to the May 1 2011 Maxmind GeoLite Country database
2011-05-10 23:04:11 -04:00
Roger Dingledine
75953f9b60
Merge branch 'maint-0.2.1' into release-0.2.1
2011-05-10 21:26:01 -04:00
Sebastian Hahn
8a36f21251
Fix a failure case of connection_ap_handshake_attach_circuit()
...
tor_fragile_assert() might be a no-op, so we have to return something
here to indicate failure to the caller.
2011-04-28 18:14:50 +02:00
Robert Ransom
f1cf9bd74d
Fix a bug introduced by purging rend_cache on NEWNYM
...
If the user sent a SIGNAL NEWNYM command after we fetched a rendezvous
descriptor, while we were building the introduction-point circuit, we
would give up entirely on trying to connect to the hidden service.
Original patch by rransom slightly edited to go into 0.2.1
2011-04-28 18:14:50 +02:00
Robert Ransom
2ad18ae736
Allow rend_client_send_introduction to fail transiently
...
i.e. without closing the AP connection.
2011-04-28 18:14:50 +02:00
Robert Ransom
440e48ddf2
Forget all rendezvous client state on SIGNAL NEWNYM
2011-04-28 18:14:50 +02:00
Nick Mathewson
43ffd023e9
Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING
...
None of the comparisons were _broken_ previously, but avoiding
signed/unsigned comparisons makes everybody happier.
Fixes bug2475.
2011-04-26 13:03:58 -04:00
Nick Mathewson
e98583594d
Fix a bug in removing DNSPort requests from their circular list
...
Under heavy load, this could result in an assertion failure. Fix for
bug 2933; bugfix on 0.2.0.10-alpha.
2011-04-21 13:39:00 -04:00
Nick Mathewson
dfc9c6a0f9
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
2011-04-19 12:30:50 -04:00
Nick Mathewson
cfd7b118a7
Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
2011-04-19 12:29:20 -04:00
Robert Ransom
adc31001c2
Add an XXX
2011-04-18 13:25:48 -07:00
Robert Ransom
bfebc942ea
Correct the warning emitted when rejecting an oversized HS desc
2011-04-18 13:17:40 -07:00
Nick Mathewson
32341ac467
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
2011-04-06 16:13:22 -04:00
Roger Dingledine
0cdd262941
switch to the apr 2011 geoip db
2011-04-04 03:52:58 -04:00
Sebastian Hahn
30b3f0cdb1
Fix a compile warning when using clang
...
Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do
anything, and we don't need to look at the return value of the function
here.
2011-03-15 15:13:35 -04:00
Roger Dingledine
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
Nick Mathewson
02d93caa09
Backport: Generate version tags using Git, not (broken) svn revisions.
...
Partial backport of daa0326aaa
2011-03-11 11:01:17 -05:00
Nick Mathewson
671318c3a8
Revert "Simplest fix to bug2402: do not include SVN versions"
...
This reverts commit a1073ee956
2011-03-11 10:47:25 -05:00
Roger Dingledine
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
Nick Mathewson
9a6df21539
Avoid crash in any_pending_bridge_descriptor_fetches
...
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-08 15:17:41 -05:00
Nick Mathewson
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
Nick Mathewson
2ce132e335
Oops, here's the *REAL* fix for the ipv6 issue
...
We need to _REJECT_ descriptors with accept6/reject6 lines. If we
let them onto the network , other un-upgraded tors will crash.
2011-03-06 13:41:55 -05:00
Nick Mathewson
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
Nick Mathewson
3da0837b0b
Revert "Disallow reject6 and accept6 lines in descriptors"
...
This reverts commit b3918b3bbb
2011-03-06 13:26:38 -05:00
Nick Mathewson
8b01fd7bad
exit_policy_is_general_exit is IPv4 only; it should admit it.
2011-03-06 13:16:53 -05:00
Sebastian Hahn
b3918b3bbb
Disallow reject6 and accept6 lines in descriptors
...
This fixes a remotely triggerable assert on directory authorities, who
don't handle descriptors with ipv6 contents well yet. We will want to
revert this once we're ready to handle ipv6.
Issue raised by lorth on #tor, who wasn't able to use Tor anymore.
Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix
on 0.2.1.3-alpha.
2011-03-06 18:20:28 +01:00
Nick Mathewson
bcbc8c51cb
Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer
2011-03-04 00:04:25 -05:00
Roger Dingledine
62d660b1da
bump to 0.2.1.30
2011-02-22 22:59:30 -05:00
Roger Dingledine
f10ec55b25
Merge branch 'maint-0.2.1' into release-0.2.1
2011-02-22 22:54:33 -05:00
Nick Mathewson
491abbc65e
Merge remote branch 'public/bug1859_021' into maint-0.2.1
2011-02-22 17:19:41 -05:00
Nick Mathewson
7605985b3f
Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
2011-02-22 15:54:13 -05:00
Roger Dingledine
95cd7f6f67
Merge branch 'maint-0.2.1' into release-0.2.1
2011-02-11 02:59:29 -05:00
Roger Dingledine
49cda713f8
Merge branch 'maint-0.2.1' into release-0.2.1
2011-02-11 00:59:34 -05:00
Roger Dingledine
28de4d83fd
fix the other half of bug 1074
2011-02-10 17:11:06 -05:00
Nick Mathewson
50c259d763
Make the DH parameter we use for TLS match the one from Apache's mod_ssl
...
Our regular DH parameters that we use for circuit and rendezvous
crypto are unchanged. This is yet another small step on the path of
protocol fingerprinting resistance.
(Backport from 0.2.2's 5ed73e3807
2011-02-10 15:55:06 -05:00
Robert Ransom
7bf06d4a4f
Ignore and warn about "PublishServerDescriptor hidserv"
...
Fixes #2408 .
2011-02-09 02:33:24 -08:00
Roger Dingledine
bcbcda309a
move the clause above the "if bw is too low" check
2011-02-07 23:22:45 -05:00
Roger Dingledine
20b75989ac
dtrt when only relaybandwidthburst is set
...
fixes bug 2470
2011-02-07 23:21:33 -05:00
Karsten Loesing
9c2cb6fc89
Update to the February 1 2011 Maxmind GeoLite Country database.
2011-02-07 22:19:37 -05:00
Nick Mathewson
a1073ee956
Simplest fix to bug2402: do not include SVN versions
...
When we stopped using svn, 0.2.1.x lost the ability to notice its svn
revision and report it in the version number. However, it kept
looking at the micro-revision.i file... so if you switched to master,
built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file
from master reported as an SVN tag. This patch takes out the "include
the svn tag" logic entirely.
Bugfix on 0.2.1.15-rc; fixes bug 2402.
2011-01-25 14:08:13 -05:00
Nick Mathewson
1471e57743
Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1
2011-01-20 14:59:23 -05:00
Robert Ransom
43414eb988
Fix bounds-checking in policy_summarize
...
Found by piebeer.
2011-01-20 11:17:57 -08:00
Roger Dingledine
Nick Mathewson
Sebastian Hahn
Robert Ransom
Karsten Loesing