ddc3eb20b7
Merge branch 'bug26116_029' into bug26116_033
2018-05-16 11:43:53 -04:00
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
bf3e899dce
Merge branch 'libressl_201805_029' into maint-0.3.3
2018-05-02 08:26:49 -04:00
75f3fbaa3c
LibreSSL compatibility fixes.
...
LibreSSL, despite not having the OpenSSL 1.1 API, does define
OPENSSL_VERSION in crypto.h. Additionally, it apparently annotates
some functions as returning NULL, so that our unit tests need to be
more careful about checking for NULL so they don't get compilation
warnings.
Closes ticket 26006.
2018-05-02 08:22:05 -04:00
e8683bcbb1
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:24:33 -04:00
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
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
c5899d5cf3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-16 13:48:23 -04:00
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
9ef4c05df8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-16 13:48:23 -04:00
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
bd42367a1e
Make get_total_system_memory mockable.
...
This patch makes get_total_system_memory mockable, which allows us to
alter the return value of the function in tests.
See: https://bugs.torproject.org/24782
2018-04-12 10:51:45 -04:00
d4bf1f6c8e
Add a paranoia check in string_is_valid_nonrfc_hostname()
...
The earlier checks in this function should ensure that components is
always nonempty. But in case somebody messes with them in the
future, let's add an extra check to make sure we aren't crashing.
2018-03-28 07:48:18 -04:00
b504c854d3
Rename string_is_valid_hostname -> string_is_valid_nonrfc_hostname
...
Per discussion on 25055.
2018-03-28 07:42:27 -04:00
09351c34e9
Don't strlen before checking for NULL
2018-03-28 07:39:03 -04:00
a28e350cff
Tweak loop condition
2018-03-28 07:39:03 -04:00
6b6d003f43
Don't explode on NULL or empty string
2018-03-28 07:39:03 -04:00
ee1fca727c
Simplify hostname validation code
2018-03-28 07:39:03 -04:00
dbb7c8e6fd
Validate hostnames with punycode TLDs correctly
2018-03-28 07:39:03 -04:00
4413e52f9e
Improve handling of trailing dot
2018-03-28 07:39:03 -04:00
6335db9fce
Refrain from including <ctype.h>
2018-03-28 07:39:03 -04:00
5986589b48
Call strlen() once
2018-03-28 07:39:03 -04:00
b0ba4aa7e9
Fix bracketed IPv6 string validation
2018-03-28 07:39:03 -04:00
1af016e96e
Do not consider IP strings valid DNS names. Fixes #25055
2018-03-28 07:39:03 -04:00
0e453929d2
Allow IPv6 address strings to be used as hostnames in SOCKS5 requests
2018-03-28 07:39:03 -04:00
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
33606405e3
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-26 10:29:29 -04:00
9f93bcd16d
Remove sb_poll check: all poll() calls are ok.
2018-03-20 08:30:21 -04:00
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
59a7b00384
Update tor.1.txt with the currently available log domains.
...
See: https://bugs.torproject.org/25378
2018-03-03 11:58:14 -05:00
bd71e0a0c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 09:54:13 -05:00
2bcd264a28
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-16 09:48:11 -05:00
cb92d47dec
Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
2018-02-16 09:41:06 -05:00
ef164346d4
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 08:47:06 -05:00
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
99fbbc6c47
Fix a typo in an address_set.c comment.
2018-02-12 11:14:34 -05:00
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
7aa94f7441
fix compilation.
2018-02-11 16:16:58 -05:00
627974b02e
Merge branch 'bug25120'
2018-02-11 16:10:58 -05:00
14c47a0b5c
Lower log-level in different error conditions in entropy selection.
...
This patch lowers the log-level from warning to info in the cases where
we are going to attempt another method as entropy source to hopefully
make the user feel less concerned.
See: https://bugs.torproject.org/25120
2018-02-11 16:10:50 -05:00
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
1df701c082
Merge branch 'maint-0.3.2'
2018-02-10 16:09:01 -05:00
Nick Mathewson
Alexander Færøy
rl1987