Stewart Smith
12aa553349
remove contrib/Makefile and contrib/suse/Makefile from configure.in
...
(otherwise would throw an error of "required file X" not found as part
of autogen.sh)
2012-08-09 11:03:47 -04:00
Stewart Smith
e612179e09
add subdir-objects to AUTOMAKE_OPTIONS, this builds object files in subdirs with non-recursive make
2012-08-09 11:03:47 -04:00
Stewart Smith
2a4a149624
Move to non-recursive make
...
This gives us a few benefits:
1) make -j clean all
this will start working, as it should. It currently doesn't.
2) increased parallel build
recursive make will max out at number of files in a directory,
non-recursive make doesn't have such a limitation
3) Removal of duplicate information in make files,
less error prone
I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way
that was used was not only deprecated but will be *removed* in the next
major automake release (1.13).... so probably best that we can continue
to bulid tor without requiring old automake.
(see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html )
For more reasons why, see resources such as:
http://miller.emu.id.au/pmiller/books/rmch/
2012-08-09 11:03:47 -04:00
Nick Mathewson
ca90aea5eb
Temporarily make spurious sendmes warn louder at arma's suggestion.
2012-08-09 10:55:33 -04:00
Nick Mathewson
0b21170085
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-09 10:52:45 -04:00
Nick Mathewson
91b52a259a
Merge remote-tracking branch 'public/bug6252_again' into maint-0.2.3
2012-08-09 10:50:11 -04:00
Roger Dingledine
0ea3a3a7a6
forward-port the 0.2.3.20-rc changelog
2012-08-07 17:27:03 -04:00
Nick Mathewson
d373922217
Speak not the name of INT_MIN; it can upset older compilers
...
And more to the point, some GCCs will warn that you can't say it
before C90.
Bug not in any released version of Tor.
2012-08-03 13:54:12 -04:00
Nick Mathewson
aa584fd3a3
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-03 12:04:36 -04:00
Nick Mathewson
93be3a8822
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/or/routerlist.c
2012-08-03 12:04:11 -04:00
Nick Mathewson
d48cebc5e4
Try to clarify impact of bug 6537
...
I don't personally agree that this is likely to be easy to exploit,
and some initial experimention I've done suggests that cache-miss
times are just plain too fast to get useful info out of when they're
mixed up with the rest of Tor's timing noise. Nevertheless, I'm
leaving Robert's initial changelog entry in the git history so that he
can be the voice of reason if I'm wrong. :)
2012-08-03 11:54:11 -04:00
Robert Ransom
308f6dad20
Mitigate a side-channel leak of which relays Tor chooses for a circuit
...
Tor's and OpenSSL's current design guarantee that there are other leaks,
but this one is likely to be more easily exploitable, and is easy to fix.
2012-08-03 11:49:51 -04:00
Nick Mathewson
860c4fc811
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-03 11:46:03 -04:00
Robert Ransom
82c5e385cb
Remove bogus comment claiming that an assertion is triggerable by consensus
2012-08-03 11:45:33 -04:00
Nick Mathewson
6c64681879
Fix a bunch of "implicit 64->32" warnings from introduce refactoring
2012-08-03 11:31:04 -04:00
Nick Mathewson
babf8e2a85
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-03 11:23:06 -04:00
Nick Mathewson
1040afb242
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2012-08-03 11:18:40 -04:00
Nick Mathewson
55f635745a
Clarify security impact of bug 6530
2012-08-03 11:16:13 -04:00
Nick Mathewson
57e35ad3d9
Avoid possible segfault when handling networkstatus vote with bad flavor
...
Fix for 6530; fix on 0.2.2.6-alpha.
2012-08-03 10:53:00 -04:00
Matthew Finkel
b50eb14bbf
Updated docs for new connections.
2012-08-02 16:15:23 -04:00
Nick Mathewson
65d8448209
Merge remote-tracking branch 'sysrqb/bug6518'
2012-08-02 15:45:10 -04:00
Matthew Finkel
a47e4343de
Constify struct sockaddr *sa parameter for check
...
The values are only being checked, not modified.
2012-08-02 15:29:38 -04:00
Matthew Finkel
d91bbf376c
Removed redundant check_sockaddr_family_match call
2012-08-02 15:13:34 -04:00
Stewart Smith
c9aafa0962
add $(AM_V_GEN) to documentation generation Makefile targets.
...
This makes the V=1 or V=0 automake silent build options display (or hide)
the full command line used.
GEN foo.bar
will be seen rather than the full command.
As with all automake silent rules, "make V=1" will output the full command.
2012-08-02 10:05:36 -04:00
Stewart Smith
9572bebcda
Enable the automake silent rules.
...
$ make V=1 # will temporarily disable them
otherwise you see:
CC foo.c
rather than the giant long bulid line.
This makes it significantly easier to spot compiler warnings etc.
Additionally, make them conditional, so we won't error on automake <
1.11
(commits squashed by nickm.)
2012-08-02 10:04:13 -04:00
Nick Mathewson
2d6d5db2fe
Defensive programming: clear rs_out between iterations.
...
I can't currently find a bug here, but there are a couple of
near-misses. Addresses ticket 6514; reported pseudonymously on
IRC.
2012-08-01 17:25:34 -04:00
Nick Mathewson
c49975a2b8
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-31 17:20:36 -04:00
Nick Mathewson
122c8efb09
Merge branch 'bug6480_squashed' into maint-0.2.3
2012-07-31 17:19:47 -04:00
Nick Mathewson
62637fa224
Avoid hard (impossible?)-to-trigger double-free in dns_resolve()
...
Fixes 6480; fix on 0.2.0.1-alpha; based on pseudonymous patch.
2012-07-31 17:19:17 -04:00
Nick Mathewson
d4e2ccc387
Merge branch 'bug6177_squashed'
2012-07-31 17:09:47 -04:00
Nick Mathewson
0e35e9235e
new changes entry for rend_service_introduce refactoring
2012-07-31 17:09:20 -04:00
Nick Mathewson
3763959ef0
test_assert is always in affect: no need for extra gotos
2012-07-31 17:08:13 -04:00
Nick Mathewson
3c30417339
Remove duplicate code in test_introduce.c
...
Two of the do_*_test functions were actually prefixes of the third,
which suggests a trivial code elimination step
2012-07-31 17:08:13 -04:00
Nick Mathewson
92f5eaa235
Whitespace tweaks
2012-07-31 17:08:13 -04:00
Andrea Shepard
96c7612679
Unit tests for new rend_intro_cell_t parser
2012-07-31 17:08:13 -04:00
Andrea Shepard
048c128f93
Add replaycache.h to noinst_HEADERS in src/or/Makefile.am
2012-07-31 17:08:12 -04:00
Andrea Shepard
471ab34032
Refactor INTRODUCE2 parsing code in rend_service_introduce()
2012-07-31 17:08:12 -04:00
Andrea Shepard
36c968491f
Use new replaycache_t structure for replay detection in rend_service_introduce()
2012-07-31 17:08:12 -04:00
Andrea Shepard
8f63ef10ad
Implement replaycache_t for bug 6177, and unit tests for the preceding
2012-07-31 17:08:05 -04:00
Nick Mathewson
d3e1e458e1
Remove the upper limit on the size of MD we can generate.
2012-07-31 13:12:07 -04:00
Nick Mathewson
43b81325b5
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-31 11:49:32 -04:00
Nick Mathewson
ae75fb13e1
changelog for bug6043
2012-07-31 11:49:20 -04:00
Ondrej Mikle
eeb81b5bb1
Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.
2012-07-31 11:41:40 -04:00
Ondrej Mikle
a7fc797edf
Fixed creating _tor user in RPM-based installs.
2012-07-31 11:41:40 -04:00
Ondrej Mikle
0e778ac604
Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.
2012-07-31 11:41:40 -04:00
Ondrej Mikle
72260cfa68
Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball.
...
Signed-off-by: Ondrej Mikle <ondrej.mikle@gmail.com>
2012-07-31 11:41:40 -04:00
Ondrej Mikle
cf20fac37f
Dependencies for RPM building with mock should work now
2012-07-31 11:41:40 -04:00
Nick Mathewson
063138e001
Warn at parse time for routerstatus entry missing a microdesc consensus
...
In 0.2.3.18-rc, we started warning on this case while building a
list of missing microdescriptor digests. That turned out to spam
the logs; instead let's warn at parse time.
Partial fix for bug 6404.
2012-07-31 11:01:57 -04:00
Nick Mathewson
7143d112a6
Don't include a router in an md consensus if we can't find a md for it.
...
The spec requires that every router in a microdesc consensus have an
m line; we weren't obeying that spec.
This creates a new consensus method (13) to allow voting to continue
to work right. Partial fix for bug 6404; fix on 0.2.2.6-alpha.
2012-07-31 10:54:14 -04:00
Nick Mathewson
2503cfad24
Allow microdescs to be up to 2k. Partial fix for 6404.
2012-07-31 10:48:35 -04:00
