Nick Mathewson
3f3739c6e0
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-24 09:40:06 -04:00
Nick Mathewson
f48fb8a720
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-24 09:40:06 -04:00
Nick Mathewson
881f7157f6
Return -1 from our PEM password callback
...
Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.
Fixes bug 26116; bugfix on 0.2.5.16.
2018-05-16 11:39:42 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
c5899d5cf3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-16 13:48:23 -04:00
Nick Mathewson
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
Nick Mathewson
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
Nick Mathewson
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
Nick Mathewson
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
Nick Mathewson
9f93bcd16d
Remove sb_poll check: all poll() calls are ok.
2018-03-20 08:30:21 -04:00
Nick Mathewson
070eda5a21
Add the poll() syscall as permitted by the sandbox
...
Apparently, sometimes getpwnam will call this.
Fixes bug 25513.
2018-03-20 08:23:44 -04:00
Nick Mathewson
bd71e0a0c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 09:54:13 -05:00
Nick Mathewson
2bcd264a28
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-16 09:48:11 -05:00
Nick Mathewson
cb92d47dec
Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
2018-02-16 09:41:06 -05:00
Nick Mathewson
1555946e20
Have tor_addr hashes return a randomized hash for AF_UNSPEC.
...
We don't expect this to come up very much, but we may as well make
sure that the value isn't predictable (as we do for the other
addresses) in case the issue ever comes up.
Spotted by teor.
2018-02-12 11:14:36 -05:00
Nick Mathewson
99fbbc6c47
Fix a typo in an address_set.c comment.
2018-02-12 11:14:34 -05:00
Nick Mathewson
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
Nick Mathewson
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
Nick Mathewson
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
Nick Mathewson
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
Nick Mathewson
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
Nick Mathewson
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
Nick Mathewson
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
Nick Mathewson
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
Nick Mathewson
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
David Goulet
112638921b
Merge branch 'ticket25183_029_01' into ticket24902_029_05
2018-02-08 16:56:21 -05:00
Nick Mathewson
0640da4269
Function to add an ipv4 address to an address_set
...
This is a convenience function, so callers don't need to wrap
the IPv4 address.
2018-02-08 14:38:14 -05:00
Nick Mathewson
46bd2aed91
Add an address-set backend using a bloom filter.
...
We're going to need this to make our anti-DoS code (see 24902) more
robust.
2018-02-08 14:38:11 -05:00
David Goulet
64149353dd
dos: Initial code of Denial of Service mitigation
...
This commit introduces the src/or/dos.{c|h} files that contains the code for
the Denial of Service mitigation subsystem. It currently contains basic
functions to initialize and free the subsystem. They are used at this commit.
The torrc options and consensus parameters are defined at this commit and
getters are implemented.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-01-30 09:18:15 -05:00
Nick Mathewson
0dbe3ddc33
Make Tor support TLS1.3 ciphers with OpenSSL 1.1.1
...
Without this patch, not only will TLS1.3 not work with Tor, but
OpenSSL 1.1.1 with TLS1.3 enabled won't build any connections at
all: It requires that either TLS1.3 be disabled, or some TLS1.3
ciphersuites be listed.
Closes ticket 24978.
2018-01-23 09:23:21 -05:00
Nick Mathewson
0bfd5a6597
Add a cast to avoid a signed/unsigned comparison
2018-01-17 09:06:32 -05:00
Roger Dingledine
5f2c7a8567
remove redundant "implement this" from log message
2018-01-05 18:23:07 -05:00
Nick Mathewson
68ca6d2e19
Don't treat a setrlimit failure as fatal.
...
Fixes bug 21074; bugfix on 4689243242
in 0.0.9rc5 when we
started doing setrlimit() in the first place.
2018-01-04 13:21:29 -05:00
Nick Mathewson
f7e393eb4c
Another attempt at fixing the STACK warning in tortls.c
...
Patch suggestion from catalyst.
Related to 24423
2017-12-13 10:09:10 -05:00
Nick Mathewson
15b41fa6ae
Make sandbox.c compile when libseccomp-dev is installed on arm64
...
Fixes ticket 24424. Patch from weasel.
2017-12-12 19:46:03 -05:00
Nick Mathewson
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
Nick Mathewson
418d8bbe92
Merge branch 'stack_fixes_032_v2' into maint-0.3.2
2017-12-11 16:25:04 -05:00
Nick Mathewson
3da15bcbe8
Stop checking for sandbox:new_element() failures: it can't fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK
2017-12-11 16:06:25 -05:00
Nick Mathewson
779e4b9dcf
Tweaks to strings in 24500
2017-12-05 12:09:57 -05:00
Fernando Fernandez Mancera
313360e6e6
Make errno error log more useful for getrandom()
...
Making errno error log more useful for getrandom() call. Adding if statement to
make difference between ENOSYS and other errors.
Fixes #24500
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-12-05 12:05:09 -05:00
Nick Mathewson
fd73a168ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 12:07:59 -05:00
Nick Mathewson
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
Nick Mathewson
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
Nick Mathewson
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
Nick Mathewson
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
Nick Mathewson
1880a6a88e
Avoid asking for passphrase on junky PEM input
...
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed
.
2017-11-27 15:25:03 -05:00
Nick Mathewson
ba94dc28e8
Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2
2017-11-21 12:37:46 -05:00
Nick Mathewson
846df5b3cd
Merge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029' into maint-0.3.2
2017-11-20 13:20:25 -05:00