George Kadianakis
ba928e1ac8
Refactor the HS ntor key expansion to fit the e2e circuit API.
...
We want to use the circuit_init_cpath_crypto() function to setup our
cpath, and that function accepts a key array as input. So let's make our
HS ntor key expansion function also return a key array as output,
instead of a struct.
Also, we actually don't need KH from the key expansion, so the key
expansion output can be one DIGEST256_LEN shorter. See here for more
info: https://trac.torproject.org/projects/tor/ticket/22052#comment:3
2017-07-07 11:12:26 -04:00
David Goulet
f8dc1164ba
prop224: Add connection and circuit identifier object
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-07-07 11:12:26 -04:00
Nick Mathewson
67b6ba6f2f
Avoid a scan_build warning in dirvote_get_intermediate_param_value
...
Fixes bug 21495.
2017-07-07 11:08:28 -04:00
Nick Mathewson
86eb63deb4
Merge remote-tracking branch 'public/bug19648'
2017-07-06 09:32:22 -04:00
Nick Mathewson
139799cdce
Merge branch 'bug20488_029_squashed'
2017-07-06 09:29:03 -04:00
Nick Mathewson
41fe94ef15
Improve warning message to stop implying nickname reg is a thing.
...
Closing ticket 20488.
2017-07-06 09:28:31 -04:00
Nick Mathewson
68a2c75ab7
Merge branch 'maint-0.3.1'
2017-07-05 17:37:14 -04:00
Nick Mathewson
9919638e98
Fix a wide line from 22207
2017-07-05 17:37:06 -04:00
Nick Mathewson
93bd60e5b0
Merge branch 'maint-0.3.1'
2017-07-05 17:00:46 -04:00
Nick Mathewson
2251667ff2
Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
2017-07-05 17:00:43 -04:00
Nick Mathewson
0dc7d68bb5
Merge branch 'maint-0.3.1'
2017-07-05 16:11:48 -04:00
Nick Mathewson
15b13578e8
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 16:11:48 -04:00
Nick Mathewson
55777b3ff9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 16:11:48 -04:00
Nick Mathewson
dfc0614840
Only disable -Wfloat-conversion on mingw when it exists.
...
The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion
didn't exist in every relevant mingw; it was added in GCC 4.9.x some
time, if the documentation can be trusted.
Bug not in any released version of tor.
2017-07-05 16:10:45 -04:00
Nick Mathewson
a85ee62e74
Make the strings from #1667 static.
2017-07-05 15:59:17 -04:00
Nick Mathewson
13024c7932
Merge branch 'maint-0.3.1'
2017-07-05 15:57:09 -04:00
Nick Mathewson
9383fa3851
Fix mixed-sign comparison warning in fix for 22797.
2017-07-05 15:56:57 -04:00
Nick Mathewson
546f5b364b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 13:43:31 -04:00
Nick Mathewson
15fddaffd5
Merge branch 'maint-0.3.1'
2017-07-05 13:43:31 -04:00
Nick Mathewson
5434b2451e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 13:43:31 -04:00
Nick Mathewson
32c0066e4b
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-05 13:43:21 -04:00
Nick Mathewson
5ff0f1ab9e
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-05 13:42:47 -04:00
Nick Mathewson
6cd6d488dc
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-05 13:42:37 -04:00
Nick Mathewson
f6420bceec
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-05 13:42:32 -04:00
Nick Mathewson
ff8c230d7c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-05 13:42:26 -04:00
Nick Mathewson
8bc70a2ad2
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 11:19:03 -04:00
Nick Mathewson
d4f08c74fe
Merge branch 'maint-0.3.1'
2017-07-05 11:19:03 -04:00
Nick Mathewson
0f97f963e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 11:19:03 -04:00
Nick Mathewson
bb97f680e7
Merge branch 'bug22801_028' into maint-0.2.9
2017-07-05 11:18:59 -04:00
Nick Mathewson
e04cc7e27f
Merge branch 'maint-0.3.1'
2017-07-05 11:16:51 -04:00
Nick Mathewson
e88aa98451
Merge branch 'teor-bug22797-025' into maint-0.3.1
2017-07-05 11:16:30 -04:00
teor
878e0d45a5
Always allow extra file descriptors when setting the connection maximum
...
When setting the maximum number of connections allowed by the OS,
always allow some extra file descriptors for other files.
Fixes bug 22797; bugfix on 0.2.0.10-alpha.
2017-07-05 11:15:10 -04:00
Nick Mathewson
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
Nick Mathewson
03b6cfd591
Extract "not an HTTP proxy" messages.
2017-07-05 11:01:17 -04:00
Nick Mathewson
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
George Kadianakis
17bd118b4c
Add test that parses a hardcoded v2 descriptor.
2017-07-05 10:14:26 -04:00
Nick Mathewson
13ccca69f1
Merge branch 'onionskin_refactor_2'
2017-07-05 10:01:48 -04:00
cypherpunks
c79e286386
Use the proper syscall in sandbox error messages
...
Fixes #22750 .
2017-07-05 09:56:28 -04:00
Nick Mathewson
3402b14089
Merge remote-tracking branch 'asn/ticket22727_032_02'
2017-07-05 09:49:12 -04:00
Nick Mathewson
b6c8530fc3
Merge remote-tracking branch 'dgoulet/ticket22726_032_02'
2017-07-05 09:36:31 -04:00
Roger Dingledine
943d284752
CREATE_FAST is for when you don't know the onion key
...
it isn't (anymore) for when you think you can get away with saving some
crypto operations.
2017-07-03 17:20:52 -04:00
Roger Dingledine
69fba1f2cd
better comments and mild refactoring
2017-07-03 17:13:08 -04:00
Nick Mathewson
9b44e2e50e
Document the new functions from the refactor
2017-07-03 16:54:41 -04:00
Nick Mathewson
2814b86875
Reindent the functions split from circuit_send_next_onion_skin().
...
This is a whitespace change only.
2017-07-03 16:54:41 -04:00
Nick Mathewson
935f84bd40
Split circuit_send_next_onion_skin() into its three main cases.
...
This commit is designed to have a very small diff. Therefore,
the indentation is wrong. The next commit will fix that.
2017-07-03 16:54:41 -04:00
Nick Mathewson
bb3f74e66b
Fix assertion failure related to openbsd strtol().
...
Fixes bug 22789; bugfix on 0.2.3.8-alpha.
2017-07-03 11:22:27 -04:00
Nick Mathewson
5361032219
Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.
...
We just have to suppress these warnings: Mingw's math.h uses gcc's
__builtin_choose_expr() facility to declare isnan, isfinite, and
signbit. But as implemented in at least some versions of gcc,
__builtin_choose_expr() can generate type warnings even from
branches that are not taken.
Fixes bug 22801; bugfix on 0.2.8.1-alpha.
2017-07-03 10:59:31 -04:00
Roger Dingledine
0fe7c42e0e
general formatting / whitespace / typo fixes
2017-07-01 17:56:06 -04:00
Nick Mathewson
83dc072e67
Bump version to 0.3.1.4-alpha-dev
2017-06-29 18:45:49 -04:00
Nick Mathewson
d9427c00df
bump to 0.3.0.9-dev
2017-06-29 18:44:43 -04:00
