Commit Graph

35254 Commits

Author SHA1 Message Date
Nick Mathewson
f470b863a0 Bump version to 0.4.2.6 2020-01-29 19:44:29 -05:00
Nick Mathewson
0fb407591b Merge branch 'maint-0.4.1' into maint-0.4.2
"Ours" merge to avoid version bump.
2020-01-29 19:42:43 -05:00
Nick Mathewson
ec7f99e6ef bump to 0.4.1.8 2020-01-29 19:42:24 -05:00
teor
c1d4399c82
Merge branch 'maint-0.4.2' 2020-01-30 07:55:20 +10:00
teor
7b6be02a92
Merge branch 'maint-0.4.1' into maint-0.4.2 2020-01-30 07:55:12 +10:00
teor
6b392c333a
Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-30 07:55:05 +10:00
teor
65825018c7
Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-30 07:54:58 +10:00
teor
9b0b2aef80
Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 2020-01-30 07:54:39 +10:00
teor
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 2020-01-30 07:53:53 +10:00
Nick Mathewson
2985a6018f buf_read_from_tls: Return ERROR_MISC, not WANTWRITE, on BUG().
Fixes bug 32673; bugfix on 0.3.0.4-alpha.  We introduced these
checks in ee5471f9aa to help diagnose 21369, but we used "-1"
when "TOR_TLS_ERROR_MISC" would have been correct.  Found by opara.

I don't think that this is actually getting triggered in the wild,
but if it were, it could cause nasty behavior: spurious
WANTREAD/WANTWRITE returns have a way of turning into CPU-eating
busy-loops.
2020-01-29 08:50:03 -05:00
Nick Mathewson
1f163fcbde Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE()
We introduced these BUG() checks in b0ddaac074 to prevent a
recurrence of bug 23690.  But there's a report of the BUG() message
getting triggered and filling up the disk.  Let's change it to
IF_BUG_ONCE().

Fixes bug 33093; bugfix on 0.3.2.2-alpha.
2020-01-29 08:31:22 -05:00
teor
f3ecf0b0a4
changes: file for 33091 2020-01-29 18:27:53 +10:00
teor
c8ba2c4730
mainloop: Simplify ip_address_changed()
Simplify ip_address_changed() by removing redundant checks
(all exits are relays, and need to rebuild their descriptor when their
IP addresses change).

Rewrite the function comment, and rename the argument, so the function
is easier to understand and use.

Closes 33091.
2020-01-29 18:23:38 +10:00
teor
d873674fb3
connection: Improve function comments
Improve the function comments on connection_finished_connecting(),
to describe what the function actually does.

Part of 33091.
2020-01-29 18:22:21 +10:00
Nick Mathewson
99671c0dae Merge remote-tracking branch 'tor-github/pr/1680' 2020-01-28 08:15:21 -05:00
Nick Mathewson
27099ffe6a Merge remote-tracking branch 'tor-github/pr/1689' 2020-01-28 07:55:34 -05:00
rl1987
9879eae17e Remove contrib/dist/rc.subr 2020-01-28 20:32:40 +08:00
teor
9d771ccc86
Travis: Stop allowing stem test failures
Stop allowing failures on the Travis CI stem tests job. It looks like
all the stem hangs we were seeing are now fixed, but let's make sure we
see them if they happen again.

Closes ticket 33075.
2020-01-28 19:56:56 +10:00
cclauss
3208a74f90 Use print() function in both Python 2 and Python 3 2020-01-28 01:38:54 +01:00
George Kadianakis
ba99287d13 Write unittest that covers cases of INTRODUCE1 handling.
Also fix some memleaks of other OB unittests.
2020-01-28 01:08:41 +02:00
George Kadianakis
635f58bad2 Introduce an hs_ob_free_all() function. 2020-01-28 01:07:51 +02:00
George Kadianakis
0133169481 Allow clients to connect to the instance even with OB enabled.
We do this by including the instance's subcredentials to the list of
subcredentials that are used during INTRO2 decryption.
2020-01-28 01:07:51 +02:00
George Kadianakis
c731988cb2 Unify INTRO2 handling codepaths in OB and normal cases.
Now we use the exact same INTRO2 decrypt logic regardless of whether the
service is an OB instance or not.

The new get_subcredential_for_handling_intro2_cell() function is responsible
for loading the right subcredentials in either case.
2020-01-28 01:07:51 +02:00
George Kadianakis
da15feb0d3 Refresh OB keys when we build a new descriptor.
We now assign OB subcredentials to the service instead of computing them on the
spot. See hs_ob_refresh_keys() for more details.
2020-01-28 01:07:28 +02:00
David Goulet
aba31e2187 Merge branch 'tor-github/pr/1683' 2020-01-27 12:04:25 -05:00
Taylor Yu
f10e6b7234 changes file for ticket 33039 2020-01-24 12:20:52 -06:00
Taylor Yu
76a8a734c9 tests for ticket 33039 2020-01-24 12:20:52 -06:00
Taylor Yu
f7a2b98674 fix leak in GETCONF
Fix a memory leak introduced by refactoring of control reply
formatting code.  Fixes bug 33039; bugfix on 0.4.3.1-alpha.
2020-01-24 12:20:47 -06:00
Nick Mathewson
cda10a2e89 Git hooks: remove support for 0.2.9 directory layout.
We no longer will be pushing or committing things in branches that
use src/common or src/or.

Resolves ticket 32957.
2020-01-23 10:28:09 -05:00
Nick Mathewson
7c76cedf0f update doc/HACKING/ReleasingTor.md 2020-01-23 08:55:55 -05:00
Nick Mathewson
e34d963c44 Bump to 0.4.3.1-alpha-dev 2020-01-22 20:30:46 -05:00
David Goulet
21d0d81d82 Merge branch 'tor-github/pr/1677' 2020-01-22 14:32:30 -05:00
Alexander Færøy
35721b38e4 Lower log level of standard error messages from PT's.
This patch lowers the log level of error messages from PT processes from
warning to debug.

See: https://bugs.torproject.org/33005
2020-01-22 14:32:13 -05:00
Nick Mathewson
6166af5077 pick a release date 2020-01-22 13:10:54 -05:00
Nick Mathewson
d3e63ee206 Add some changelog edits from seborn 2020-01-22 13:10:09 -05:00
Nick Mathewson
5b98eee4da draft a changelog blurb for 0.4.3.1-alpha 2020-01-22 11:56:44 -05:00
rl1987
a207fd7226 Add changes file 2020-01-22 20:26:04 +08:00
rl1987
f1c50a0e75 Run doxygen makefile target on Travis 2020-01-22 20:26:04 +08:00
teor
08efb28743
dir_connection_t: Explain dirconn_direct better
Direct connections can use a DirPort or ORPort.
Indirect connections must use a multi-hop Tor circuit.

Comment-only changes.
2020-01-22 09:27:40 +10:00
Nick Mathewson
e144134294 Bump to 0.4.3.1-alpha 2020-01-21 12:33:05 -05:00
Nick Mathewson
87f129977c changelog: small edits 2020-01-21 12:32:33 -05:00
Nick Mathewson
2d8090fc66 Run format_changelog.py 2020-01-21 11:38:56 -05:00
Nick Mathewson
9aebb252a1 Initial incorporation of 0.4.3.x changelogs. 2020-01-21 11:35:59 -05:00
Nick Mathewson
722a6d3eb8 Remove changes files that already appeared in 0.4.2.5 2020-01-21 11:33:26 -05:00
Nick Mathewson
942543253a Use time-invariant conditional memcpy to make onionbalance loop safer 2020-01-21 10:31:36 -05:00
Nick Mathewson
4269ab97c6 Add a function to maybe memcpy() a value, in constant time. 2020-01-21 10:31:36 -05:00
Nick Mathewson
b6250236a2 Pass multiple subcredentials all the way down to hs_ntor.
This approach saves us a pair of curve25519 operations for every
subcredential but the first.  It is not yet constant-time.

I've noted a few places where IMO we should refactor the code so
that the complete list of subcredentials is passed in earlier.
2020-01-21 10:31:36 -05:00
Nick Mathewson
46e6a4819a Define a variant of hs_ntor that takes multiple subcredentials. 2020-01-21 10:31:29 -05:00
Nick Mathewson
bd0efb2702 Remove a dead BUG() check. 2020-01-21 10:31:29 -05:00
Nick Mathewson
4532c7ef6a Turn hs_subcredential_t into a proper struct. 2020-01-21 10:31:29 -05:00