Nick Mathewson
36880b3f17
Merge remote branch 'origin/maint-0.2.2'
2011-01-25 14:30:01 -05:00
Sebastian Hahn
68f8ca357f
Fix assert for relay/bridge state change
...
When we added support for separate client tls certs on bridges in
a2bb0bfdd5
we forgot to correctly initialize this when changing
from relay to bridge or vice versa while Tor is running. Fix that
by always initializing keys when the state changes.
Fixes bug 2433.
2011-01-25 14:13:06 -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
aaa5737a2e
Merge remote branch 'origin/maint-0.2.2'
2011-01-24 17:51:52 -05:00
Nick Mathewson
5ed73e3807
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.
2011-01-24 16:50:11 -05:00
Nick Mathewson
c496229b0a
Merge remote branch 'origin/maint-0.2.2'
2011-01-20 15:00:42 -05:00
Nick Mathewson
13e9a2b19d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-20 15:00:24 -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
Nick Mathewson
f6a25a995e
Merge remote branch 'origin/maint-0.2.2'
2011-01-19 13:26:23 -05:00
Nick Mathewson
a793f1f6f2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-19 13:25:38 -05:00
Nick Mathewson
c8f94eed12
Oops; actually add the code to the last patch. :/
2011-01-19 13:25:17 -05:00
Nick Mathewson
971e83ef9c
Fix two more SIZE_T_CEILING issues
...
This patch imposes (very long) limits on the length of a line in a
directory document, and on the length of a certificate. I don't
think it should actually be possible to overrun these remotely,
since we already impose a maximum size on any directory object we're
downloading, but a little defensive programming never hurt anybody.
Roger emailed me that doorss reported these on IRC, but nobody seems
to have put them on the bugtracker.
2011-01-19 13:22:50 -05:00
Karsten Loesing
3bd3437538
List circuit build time related consensus params in dir-spec.txt.
2011-01-19 08:43:33 +01:00
Roger Dingledine
670ff24788
fix 0.2.2 changelog to match 0.2.1
2011-01-18 19:15:31 -05:00
Roger Dingledine
369994a6e9
Merge branch 'maint-0.2.2'
2011-01-18 19:15:00 -05:00
Roger Dingledine
9bb947ea14
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-01-18 19:13:24 -05:00
Roger Dingledine
8875a028a7
be the winner, rewrite history
2011-01-18 19:12:01 -05:00
Taylor R Campbell
0f728e200a
trivial make-signature.sh patch
2011-01-15 23:03:20 -05:00
Roger Dingledine
c947db7f4b
forward-port that part of the changelog
2011-01-15 22:42:14 -05:00
Roger Dingledine
4ff97e3775
Merge branch 'maint-0.2.2'
2011-01-15 22:39:15 -05:00
Roger Dingledine
7699014e1e
Merge commit 'sebastian/bug2317' into maint-0.2.2
2011-01-15 21:54:49 -05:00
Roger Dingledine
8e9b25e6c7
some changelog entries for master too
2011-01-15 20:59:25 -05:00
Roger Dingledine
6a6e3adf01
Merge branch 'maint-0.2.2'
2011-01-15 20:08:37 -05:00
Roger Dingledine
bebd95e2c9
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-01-15 19:57:01 -05:00
Roger Dingledine
5110490253
0.2.1.29 changelog and blurb
2011-01-15 19:56:10 -05:00
Nick Mathewson
6ccb16438a
Add a make-signature.sh script.
2011-01-15 15:00:41 -05:00
Nick Mathewson
07888ed8e4
Merge remote branch 'origin/maint-0.2.2'
2011-01-15 14:17:59 -05:00
Nick Mathewson
a7790d48af
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 14:15:19 -05:00
Nick Mathewson
ef6fa07e48
Fix a couple of non-cleared key issues in hidden services
...
we need to do more hunting, but this fixes the ones mentioned in 2385.
2011-01-15 14:10:54 -05:00
Nick Mathewson
9b09627edd
Zero out some more key data before freeing it
...
Found by cypherpunks; fixes bug 2384.
2011-01-15 14:10:52 -05:00
Sebastian Hahn
a1860cc3f1
Update the spec with the new bounds
2011-01-15 19:50:06 +01:00
Sebastian Hahn
0df51a7f39
Tighten accepted circwindow parameters
...
Based on discussion in bug 2317, these values seem to be sane.
2011-01-15 19:42:17 +01:00
Sebastian Hahn
b06617c948
Provide constant limits for all consensus params
...
This addresses Nick's concern about doing non-constant bounds checking
inside networkstatus_get_param().
2011-01-15 19:42:17 +01:00
Sebastian Hahn
932e5c3cf0
Fix a typo spotted by Roger
2011-01-15 19:42:17 +01:00
Sebastian Hahn
026e7987ad
Sanity-check consensus param values
...
We need to make sure that the worst thing that a weird consensus param
can do to us is to break our Tor (and only if the other Tors are
reliably broken in the same way) so that the majority of directory
authorities can't pull any attacks that are worse than the DoS that
they can trigger by simply shutting down.
One of these worse things was the cbtnummodes parameter, which could
lead to heap corruption on some systems if the value was sufficiently
large.
This commit fixes this particular issue and also introduces sanity
checking for all consensus parameters.
2011-01-15 19:42:17 +01:00
Sebastian Hahn
ca6c813612
Make get_net_param_from_list() static
...
This prepares for making the accessor method for consensus parameters
safer in the next commit.
2011-01-15 19:42:17 +01:00
Nick Mathewson
1758ef51de
Merge remote branch 'origin/maint-0.2.2'
2011-01-15 13:26:02 -05:00
Nick Mathewson
1393985768
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/routerparse.c
src/or/test.c
2011-01-15 13:25:13 -05:00
Nick Mathewson
b97b0efec8
Merge branch 'bug2352_obsize' into maint-0.2.1
2011-01-15 13:15:06 -05:00
Robert Ransom
7ea674e0e0
Remove some unnecessary occurrences of +1.
...
I dug through the OpenSSL source and verified that RSA_private_decrypt will
not write more than RSA_size(key) bytes to its output buffer.
2011-01-15 13:11:44 -05:00
Nick Mathewson
60fa447afa
Merge remote branch 'origin/maint-0.2.2'
2011-01-15 13:11:10 -05:00
Nick Mathewson
9d133464c8
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 13:10:14 -05:00
Nick Mathewson
31b562e10a
Add missing check for hostname answer_len in dnsserv size
...
This is checked elsewhere too, but let's be RFC-conformant.
2011-01-15 13:09:12 -05:00
Nick Mathewson
3ae4df5cd7
Merge remote branch 'origin/maint-0.2.2'
2011-01-15 12:49:22 -05:00
Nick Mathewson
6def56848d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 12:48:40 -05:00
Nick Mathewson
c2aa2db8b5
Merge branch 'bug2332_part2' into maint-0.2.1
2011-01-15 12:43:02 -05:00
Nick Mathewson
f550c96ade
Merge remote branch 'origin/maint-0.2.2'
2011-01-15 12:16:18 -05:00
Nick Mathewson
cff4cfef4f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-15 12:13:50 -05:00
Nick Mathewson
8f11642ceb
Merge branch 'bug2324_uncompress' into maint-0.2.1
2011-01-15 12:12:34 -05:00