Nick Mathewson
75ad1a1f2f
Merge remote-tracking branch 'onionk/doublevote1'
2018-09-11 13:16:49 -04:00
Nick Mathewson
042a9fd8b0
Merge branch 'maint-0.3.4'
2018-09-11 13:09:21 -04:00
Nick Mathewson
89c5b8d7dc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 13:09:21 -04:00
Nick Mathewson
1d8957129b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 13:09:21 -04:00
Nick Mathewson
5a8827a4c9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 13:09:21 -04:00
Nick Mathewson
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
Nick Mathewson
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
Nick Mathewson
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
Nick Mathewson
198b6354e6
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
2018-09-11 13:08:57 -04:00
Nick Mathewson
328bcbf305
Merge remote-tracking branch 'tor-github/pr/313'
2018-09-11 12:23:21 -04:00
Nick Mathewson
a7d0cbd462
Merge remote-tracking branch 'tor-github/pr/314'
2018-09-11 12:19:13 -04:00
Nick Mathewson
8a873a5695
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 12:04:56 -04:00
Nick Mathewson
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
Nick Mathewson
f741505642
Merge branch 'maint-0.3.4'
2018-09-11 12:04:56 -04:00
Nick Mathewson
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
Nick Mathewson
e5601f14ed
Initialize 't' in ge25519_scalarmult_base_niels()
...
OSS-Fuzz's version of memorysanitizer can't tell that this value is
not going to be used unsafely.
2018-09-11 10:35:18 -04:00
Karsten Loesing
19429fac23
Update geoip and geoip6 to the September 6 2018 database.
2018-09-11 09:26:59 +02:00
rl1987
1ec54b3556
Bugfix: sizeof(socklen) doesn't make sense when calling connect()
...
Bugfix on 2f657a1416f2f81dd1be900269c4ae9bdb29f52d; bug not in
any Tor release.
2018-09-10 21:50:30 +03:00
David Goulet
7ff67d0e90
test: Fix coverity CID 1439129
...
One HSv3 unit test used "tor_memeq()" without checking the return value. This
commit changes that to use "tt_mem_op()" to actually make the test validate
something :).
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-10 10:28:35 -04:00
David Goulet
064d3e7497
test: Fix coverity CID 1439130
...
Trivial fix of removing an uneeded NULL check in an HS v3 unit test.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-10 10:22:31 -04:00
David Goulet
58d74ad943
test: Fix coverity CID 1439131
...
Simple uninitialized object that we could free in an HS v3 unit test.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-10 10:20:58 -04:00
Nick Mathewson
b87a95289b
Copy changelogs and releasenotes to master
2018-09-10 10:03:01 -04:00
George Kadianakis
34a2cbb249
Address coverity warnings (CID 1439133/1439132).
...
>>>> CID 1439133: Null pointer dereferences (REVERSE_INULL)
>>>> Null-checking "fields" suggests that it may be null, but it
>>>> has already been dereferenced on all paths leading to the check.
>>>> CID 1439132: Null pointer dereferences (REVERSE_INULL)
>>>> Null-checking "fields" suggests that it may be null, but it
>>>> has already been dereferenced on all paths leading to the check.
2018-09-10 16:54:19 +03:00
Nick Mathewson
ba2cc781ef
Merge branch 'maint-0.3.4'
...
"ours" to avoid version bump.
2018-09-10 09:42:50 -04:00
Nick Mathewson
96601a6805
Bump to 0.3.4.8-dev
2018-09-10 09:42:40 -04:00
Nick Mathewson
7a343ecec5
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump.
2018-09-10 09:42:22 -04:00
Nick Mathewson
05f5f65006
Bump to 0.3.3.10-dev.
2018-09-10 09:42:12 -04:00
Nick Mathewson
8cfca28be2
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid version bump.
2018-09-10 09:41:55 -04:00
Nick Mathewson
8408331b3e
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid version bump.
2018-09-10 09:41:39 -04:00
Nick Mathewson
ec4a7641f1
Bump to 0.3.2.12-dev
2018-09-10 09:41:34 -04:00
Nick Mathewson
b203dedaf5
Bump to 0.2.9.17-dev
2018-09-10 09:41:22 -04:00
Nick Mathewson
a52d5d5309
Refactor initialization in curve25519_basepoint_spot_check
...
This is an attempt to work around what I think may be a bug in
OSS-Fuzz, which thinks that uninitialized data might be passed to
the curve25519 functions.
2018-09-09 10:21:13 -04:00
Roger Dingledine
776c1a5d1a
make ipv6-only config complaint clearer
...
(a relay operator hit this on #tor-relays and couldn't make sense
of it. i couldn't either until i went to go read the code.)
2018-09-08 17:08:22 -04:00
Nick Mathewson
9f0e8d8c03
Merge branch 'maint-0.3.4'
2018-09-07 15:14:03 -04:00
Nick Mathewson
0d5aaef465
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid bump.
2018-09-07 15:12:27 -04:00
Nick Mathewson
cff7cb858b
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid bump
2018-09-07 15:12:09 -04:00
Nick Mathewson
36885f34f6
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid bump
2018-09-07 15:11:49 -04:00
Nick Mathewson
43e400f340
Bump to 0.3.3.10
2018-09-07 15:11:18 -04:00
Nick Mathewson
cdaf9aec8e
Bump to 0.3.2.12
2018-09-07 15:11:07 -04:00
Nick Mathewson
da29074fc4
Bump to 0.2.9.17
2018-09-07 15:10:49 -04:00
Nick Mathewson
9ca1af9a87
Merge remote-tracking branch 'dgoulet/ticket20700_035_03'
2018-09-07 15:03:32 -04:00
George Kadianakis
3695ef6343
HSv3: Don't assert when reading bad client-side privkeys.
2018-09-07 14:05:07 -04:00
George Kadianakis
6583d1e709
HSv3: Add subcredential in client auth KDF on the client-side.
2018-09-07 14:05:07 -04:00
George Kadianakis
1e9428dc61
HSv3: Add subcredential in client auth KDF on the service-side.
...
Also update some client auth test vectors that broke...
2018-09-07 14:05:07 -04:00
David Goulet
c76d00abfa
hs-v3: Make hs_desc_build_fake_authorized_client() return an object
...
Return a newly allocated fake client authorization object instead of taking
the object as a parameter.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-07 14:03:55 -04:00
Suphanat Chunhapanya
5e1d36c7db
bug: Use PATH_SEPARATOR instead of slash
...
In function get_fname_suffix, previously it uses /, but in fact it
should use PATH_SEPARATOR.
2018-09-07 14:03:55 -04:00
David Goulet
8e57986e7d
hs-v3: Improve v3 client authorization logging
...
Part of #20700 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-07 14:03:55 -04:00
Suphanat Chunhapanya
5b2871d2f2
hs-v3: Log client auth load activities client side
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-07 14:03:55 -04:00
Suphanat Chunhapanya
7ace28c952
hs-v3: Log client auth load activities service side
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-07 14:03:55 -04:00
Suphanat Chunhapanya
83c8419e73
hs-v3: Rename client_pk to client_auth_pk
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-07 14:03:08 -04:00