Nick Mathewson
f608872b0c
C style fix: a no-args function is void fn(void), not void fn().
2011-03-03 23:42:14 -05:00
Nick Mathewson
8ae179deec
Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear.
2011-03-03 23:41:34 -05:00
Robert Ransom
4d21fe2870
Emend changes/tls-hash
2011-03-03 17:54:53 -08:00
Robert Ransom
74fc993b98
Check the result of SSL_set_ex_data
...
Reported by piebeer.
2011-03-03 16:17:39 -08:00
Robert Ransom
fe1137be6f
Use SSL_*_ex_data instead of SSL_*_app_data
...
SSL_*_app_data uses ex_data index 0, which will be the first one allocated
by SSL_get_ex_new_index. Thus, if we ever started using the ex_data feature
for some other purpose, or a library linked to Tor ever started using
OpenSSL's ex_data feature, Tor would break in spectacular and mysterious
ways. Using the SSL_*_ex_data functions directly now may save us from
that particular form of breakage in the future.
But I would not be surprised if using OpenSSL's ex_data functions at all
(directly or not) comes back to bite us on our backends quite hard. The
specified behaviour of dup_func in the man page is stupid, and
crypto/ex_data.c is a horrific mess.
2011-03-03 15:34:53 -08:00
Robert Ransom
13ee803469
Remove now-unused helper functions
...
These functions were needed only by code removed in the preceding commit.
Reported by mobmix.
2011-03-03 14:59:21 -08:00
Gladys Shufflebottom
49de5431d5
remove tls related hash table code
2011-03-01 18:11:25 -05:00
Nick Mathewson
d60a7c2f8d
Merge remote branch 'origin/maint-0.2.2'
2011-03-01 17:15:37 -05:00
Nick Mathewson
6b7408178b
Avoid spurious bwhist parsing failures
...
This should fix a bug that special ran into, where if your state file
didn't record period maxima, it would never decide that it had
successfully parsed itself unless you got lucky with your
uninitialized-variable values.
This patch also tries to improve error messags in the case where a
maximum value legitimately doesn't parse.
2011-03-01 17:08:02 -05:00
Nick Mathewson
42c1a47123
Revert bug1074_launch_authconn* branch: needs more design, less crashing
2011-02-28 12:58:29 -05:00
Nick Mathewson
b3d74045ae
Add a missing const
2011-02-25 12:32:29 -05:00
Nick Mathewson
a47fdaf9a0
Merge branch 'bug1074_launch_conn_on_skew'
...
Fixed conflict on rename of router_get_by_digest->router_get_by_id_digest
Conflicts:
src/or/command.c
2011-02-25 12:12:44 -05:00
Nick Mathewson
22810d740c
Changes file for altf4's bug1074 stuff
2011-02-25 12:12:02 -05:00
Nick Mathewson
c94f3711ee
whitespace fixup
2011-02-25 12:05:33 -05:00
AltF4
612c7f3242
Fix for #1074 previous rev
...
Changed tor_addr_from_ipv4n to tor_addr_from_ipv4h
and changed descriptor_digest to identity_digest
2011-02-25 11:57:16 -05:00
AltF4
24096d0cec
Fix for #1074 "Part 3"
...
Changed received_netinfo_from_trusted_dir into a
tristate in order to keep track of whether we have
already tried contacting a trusted dir. So we don't
send multiple requests if we get a bunch of skews.
2011-02-25 11:57:15 -05:00
AltF4
82023f6a1e
Sebastian's Changes to #1074
...
Fixes some small mistakes with AltF4's #1074 fix
2011-02-25 11:57:15 -05:00
AltF4
b8bef61a8f
Fix time skew values from untrusted sources
...
Now when we receive a large time skew from a source which isn't a trusted dir, we go contact a trusted dir to trigger a NETINFO cell.
2011-02-25 11:57:11 -05:00
Nick Mathewson
a2a8adeee5
Merge remote branch 'origin/maint-0.2.2'
2011-02-25 11:24:35 -05:00
Nick Mathewson
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
2011-02-25 11:22:12 -05:00
Karsten Loesing
0642b92792
Fix two potential bugs in the bug1863 code.
2011-02-24 16:44:54 +01:00
Nick Mathewson
0a6beb9368
Fix memory leak in md-download logic
...
Also fix some microdesc comments
Fix for bug 2623
2011-02-24 09:47:33 -05:00
Nick Mathewson
feaa0120d0
Merge remote branch 'sebastian/osx_compile'
2011-02-24 09:27:04 -05:00
Sebastian Hahn
303c04109b
Fix a couple of compile warnings on OS X 10.6
2011-02-24 07:19:09 +01:00
Nick Mathewson
9265164180
Merge remote branch 'origin/maint-0.2.2'
...
There was a conflict from the node_t transition, but it was an easy fix.
Conflicts:
src/or/circuitbuild.c
2011-02-22 18:41:06 -05:00
Nick Mathewson
16b8b9b00f
Merge remote branch 'arma/bug2403' into maint-0.2.2
2011-02-22 18:38:03 -05:00
Nick Mathewson
f16178c08f
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 18:25:16 -05:00
Nick Mathewson
530e87ce31
Add some dollar signs in an attempt to appease older asciidocs
...
We should really require a modern asiidoc: backporting stuff to 8.2 is
a timesink.
2011-02-22 18:24:33 -05:00
Nick Mathewson
c2f111a631
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
2011-02-22 17:55:17 -05:00
Roger Dingledine
a2727f6249
prevent same entry and exit for insane edge case
2011-02-22 17:54:25 -05:00
Nick Mathewson
596f7a39b6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
configure.in
2011-02-22 17:53:09 -05:00
Nick Mathewson
10ad3442e1
Remove doc/spec/Makefile.in from list of generated files
2011-02-22 17:51:03 -05:00
Nick Mathewson
bbf782dc13
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 17:21:34 -05:00
Nick Mathewson
06deec15c9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)
2011-02-22 17:20:59 -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
3d4c2ffa30
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 15:58:50 -05:00
Roger Dingledine
e606f19fa3
changes file for removing torspec from the tarball
2011-02-22 15:58:19 -05:00
Nick Mathewson
84cdcc68a9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Use "ours" strategy" to avoid taking bug2402 fix.
2011-02-22 15:57:55 -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
372773d681
changes file for removing torspec from the tarball
2011-02-22 14:50:00 -05:00
Roger Dingledine
108f48dfc7
Merge branch 'maint-0.2.2'
2011-02-22 14:44:32 -05:00
Roger Dingledine
4f730e4f3f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-22 14:44:09 -05:00
Roger Dingledine
0ab62a4dc5
prefer https urls
2011-02-22 14:39:09 -05:00
Nick Mathewson
2eadbd41f0
Merge remote branch 'sebastian/bug2496'
2011-02-22 14:17:11 -05:00
Nick Mathewson
b7f201f746
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/policies.c
src/or/policies.h
2011-02-22 14:10:42 -05:00
Nick Mathewson
cdc59c198a
Don't let bad DNS make exit policy and declared exit policy get out of sync
...
Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
2011-02-22 14:06:28 -05:00
Nick Mathewson
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
Nick Mathewson
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
Nick Mathewson
ce149c1022
That shalt also not have a label without a statement.
2011-02-22 12:52:52 -05:00
Nick Mathewson
933ffd536d
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 12:47:47 -05:00