Nick Mathewson
f5fc7e3306
Fix a crash bug introduced in 223d354e3
.
...
Arma found this and commented on #11243 . Bug not in any released
version of Tor.
2014-10-26 14:09:03 -04:00
Nick Mathewson
1ce57267b4
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-10-24 09:23:53 -04:00
Nick Mathewson
9e2608b0d3
bump version to 0.2.5.10-dev
2014-10-24 09:22:58 -04:00
Nick Mathewson
9116f49c77
Forward-port changelog and release notes for 0.2.5.10
2014-10-24 09:21:40 -04:00
Nick Mathewson
ac4dd248e1
Switch new time tests to use SIZEOF_TIME_T, not sizeof(time_t)
...
Otherwise, we get implicit conversion warning on some platforms.
2014-10-22 12:57:21 -04:00
teor
c9d0967dd9
Fix minor typos, two line lengths, and a repeated include
2014-10-23 02:57:11 +11:00
Nick Mathewson
67fdfcf27c
Fix a changes typo spotted by wfn
2014-10-22 11:02:56 -04:00
Nick Mathewson
653221e807
Merge remote-tracking branch 'public/bug11824_v2'
2014-10-22 11:01:50 -04:00
Nick Mathewson
8e4daa7bb0
Merge remote-tracking branch 'public/ticket6938'
...
Conflicts:
src/tools/tor-resolve.c
2014-10-22 10:14:03 -04:00
Roger Dingledine
71613993e0
give dist-master an alias
2014-10-21 16:01:29 -04:00
Nick Mathewson
3826a88fc0
Merge remote-tracking branch 'teor/bug13476-improve-time-handling'
2014-10-21 13:14:27 -04:00
meejah
3d0d49be23
Additional test for error-case
...
This error-case was already fixed by previous changes,
this is to cover it in case there's a regression.
2014-10-21 00:14:57 -06:00
teor
a1c6a40c22
Conditionally compile time testing code based on integer size
2014-10-21 08:44:10 +11:00
Nick Mathewson
e3d166b7a6
Merge remote-tracking branch 'teor/memwipe-more-keys'
2014-10-20 11:12:51 -04:00
Nick Mathewson
d6fab2afd7
Merge remote-tracking branch 'origin/maint-0.2.5'
...
This is an "ours" merge so we can leave the version in master alone.
2014-10-20 10:33:53 -04:00
Nick Mathewson
3202ac6006
bump maint-0.2.5 to 0.2.5.9-rc-dev
2014-10-20 10:32:09 -04:00
Nick Mathewson
af0fdb85e9
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-20 10:31:20 -04:00
Nick Mathewson
fed78bce8b
Whoops, bump the version properly.
2014-10-20 10:29:16 -04:00
Nick Mathewson
e2112dd0c0
bump maint-0.2.4 to 0.2.4.25-dev
2014-10-20 10:24:21 -04:00
Nick Mathewson
c6416f31a5
forward-port the 0.2.4.25 changelog to master changelog and releasenotes
2014-10-20 10:01:07 -04:00
Nick Mathewson
affa251c83
Use a macro to indicate "The ecdhe group we use by default".
...
This might make Coverity happier about the if statement where we
have a default case that's the same as one of the other cases. CID 1248515
2014-10-20 09:08:42 -04:00
Nick Mathewson
2d4c40ee5f
Fix a use-after-free error in cleaned-up rouerlist code.
...
Bug not in any released tor. This is CID 1248521
2014-10-20 09:04:53 -04:00
Roger Dingledine
05791a0b72
explain how to publish tarballs now that webwml has gone to git
2014-10-19 21:27:41 -04:00
Nick Mathewson
291cd50939
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-10-19 15:40:25 -04:00
Nick Mathewson
fd8f21e730
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-19 15:40:07 -04:00
Nick Mathewson
403c6ae78e
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-19 15:39:48 -04:00
Nick Mathewson
c1dd598df8
Note that our #13426 fix is also a #13471 fix.
...
See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2
2014-10-19 15:38:44 -04:00
Nick Mathewson
6c5db03e02
format_changelog: Sort sections case-insensitively
2014-10-19 14:19:22 -04:00
Nick Mathewson
5344093829
format_changelog.py: fix spelling of "hyphenatable"
2014-10-19 12:59:17 -04:00
Nick Mathewson
29b0e82b5a
format_changelog.py: tweak hyphenation rules
...
Mark all our generated command names, and anything with a
double-hyphen, as unhyphenatable.
2014-10-19 12:57:57 -04:00
Nick Mathewson
45f534e6df
Teach format_changelog to sort and collate sections.
...
Give it options to turn off collation and/or wrapping.
2014-10-19 12:44:19 -04:00
teor
2e1f5c1fc0
Memwipe more keys after tor has finished with them
...
Ensure we securely wipe keys from memory after
crypto_digest_get_digest and init_curve25519_keypair_from_file
have finished using them.
Fixes bug 13477.
2014-10-20 03:06:28 +11:00
teor
879b39e1a8
Further unit test tor_timegm and parse_rfc1123_time
...
Add unit tests for tor_timegm signed overflow,
tor_timegm and parse_rfc1123_time validity checks,
and correct_tm year clamping.
Unit tests (visible) fixes in bug 13476.
2014-10-20 02:52:21 +11:00
teor
d7b13543e2
Clamp (some) years supplied by the system to 1 CE
...
Clamp year values returned by system localtime(_r) and
gmtime(_r) to year 1. This ensures tor can read any
values it might write out.
Fixes bug 13476.
2014-10-20 02:47:31 +11:00
Nick Mathewson
1405fbcc58
format_changelog.py: learn about the ReleaseNotes format
2014-10-19 11:47:16 -04:00
teor
238b8eaa60
Improve date validation in HTTP headers
...
Check all date/time values passed to tor_timegm
and parse_rfc1123_time for validity, taking leap
years into account.
Improves HTTP header validation.
Avoid unlikely signed integer overflow in tor_timegm
on systems with 32-bit time_t.
Fixes bug 13476.
2014-10-20 02:40:27 +11:00
teor
dd556fb1e6
Use correct day of year in correct_tm()
...
Set the correct day of year value in correct_tm() when the
system's localtime(_r) or gmtime(_r) functions fail to set struct tm.
Fixes bug 13476.
2014-10-20 02:32:05 +11:00
Nick Mathewson
fc5cab4472
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-10-16 13:29:14 -04:00
Nick Mathewson
ab4b29625d
Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN
...
Closes 8093.
2014-10-16 13:04:11 -04:00
Nick Mathewson
a5cc5ad08d
Merge remote-tracking branch 'yawning/bug13314'
2014-10-16 09:12:13 -04:00
Nick Mathewson
33b399a7b2
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-10-16 09:09:20 -04:00
Nick Mathewson
22b9caf0ae
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-16 09:08:52 -04:00
Nick Mathewson
943fd4a252
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-16 09:08:32 -04:00
Nick Mathewson
c1c83eb376
Merge branch 'no_sslv3_023' into maint-0.2.3
2014-10-16 09:08:09 -04:00
Nick Mathewson
af73d3e4d8
Disable SSLv3 unconditionally. Closes ticket 13426.
...
The POODLE attack doesn't affect Tor, but there's no reason to tempt
fate: SSLv3 isn't going to get any better.
2014-10-15 11:50:05 -04:00
Nick Mathewson
48af23eb0d
Emit fewer spurious lines in cov-diff output.
2014-10-14 09:41:40 -04:00
Nick Mathewson
21fe945ebd
Define a strnlen replacement on platforms (win32) that lack it
...
Right now this is only needed for test_util_format_time_interval, so
define it as a static function. We can move it into compat later if
we need to.
2014-10-13 14:59:17 -04:00
Nick Mathewson
d950e24332
Merge remote-tracking branch 'public/bug11243_squashed'
2014-10-13 14:32:43 -04:00
Nick Mathewson
9df61d7028
Add comments to can_dl_again usage
2014-10-13 14:31:11 -04:00
Nick Mathewson
500c406364
Note that parse-list functions may add duplicate 'invalid' entries.
2014-10-13 14:31:11 -04:00