Nick Mathewson
cbc1b8a4f7
fix "make check-spaces"
2015-11-20 10:52:56 -05:00
teor (Tim Wilson-Brown)
53ec840bdf
Make tor_ersatz_socketpair work on IPv6-only systems
...
(But it won't work on some systems without IPv4/IPv6 localhost
(some BSD jails) by design, to avoid creating sockets on routable
IP addresses. However, those systems likely have the AF_UNIX socketpair,
which tor prefers.)
Fixes bug #17638 ; bugfix on a very early tor version,
earlier than 22dba27d8d
(23 Nov 2004) / svn:r2943.
Patch by "teor".
2015-11-19 19:08:22 +11:00
teor (Tim Wilson-Brown)
878b5738c2
Update comments in get_interface_addresses_ioctl
...
Comment-only change noting platforms that can return IPv6
addresses from SIOCGIFCONF (or SIOCGLIFCONF).
2015-11-18 23:30:25 +11:00
Nick Mathewson
7a940fac1c
appease check-spaces
2015-11-13 13:46:47 -05:00
Nick Mathewson
d467227323
Merge remote-tracking branch 'public/ticket11150_client_only'
2015-11-13 09:58:16 -05:00
Nick Mathewson
accb726db6
Remove a little duplicated code in TAP key expansion
...
patch from pfrankw; closes 17587.
2015-11-13 09:46:32 -05:00
Nick Mathewson
d20a3d07e3
Merge branch 'karsten_bug13192_026_03_teor'
2015-11-12 11:40:58 -05:00
Nick Mathewson
1f7ba115a4
Rename cast_double_to_int64 to clamp_double_to_int64
2015-11-12 11:33:48 -05:00
Nick Mathewson
0694263b75
Make round_to_next_multiple_of always round upwards.
...
Yes, even if it has to return a non-multiple. This prevents us from
ever having a bug where we try to use it for allocation, and under-allocate.
2015-11-12 11:32:14 -05:00
Nick Mathewson
05c34b3330
appease check-spaces
2015-11-10 10:40:19 -05:00
Nick Mathewson
39e8fa81f7
every version of openssl we support has SSL_get_state
2015-11-10 10:14:58 -05:00
Nick Mathewson
3aebeeffa5
Every openssl we support has ERR_remove_thread_state
2015-11-10 10:13:04 -05:00
Nick Mathewson
c32a43a4d2
Move openssl version compatibility defines into a new header.
2015-11-10 10:02:21 -05:00
Yawning Angel
3e3ec750cd
Fix compilation with OpenSSL 1.1.0-dev.
...
OpenSSL changed the API:
* 5998e29035
* b0700d2c8d
2015-11-06 19:02:56 +00:00
Nick Mathewson
5e9f2384cf
Fix various coverity-found issues
2015-10-21 16:01:29 -04:00
Nick Mathewson
f217b24e05
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 12:03:04 -04:00
Nick Mathewson
4fb4906975
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
2015-10-21 12:02:42 -04:00
Nick Mathewson
9459ae260e
Fix the return value
2015-10-21 12:01:05 -04:00
Nick Mathewson
895a98dbaf
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 11:53:00 -04:00
Nick Mathewson
b809c265e7
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
2015-10-21 11:51:03 -04:00
Nick Mathewson
35bf07b8d6
Check for len < 4 in dn_indicates_v3_cert
...
Without this check, we potentially look up to 3 characters before
the start of a malloc'd segment, which could provoke a crash under
certain (weird afaik) circumstances.
Fixes 17404; bugfix on 0.2.6.3-alpha.
2015-10-21 11:44:43 -04:00
Nick Mathewson
2461ea1faa
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 08:17:34 -04:00
Nick Mathewson
542cc8a5ff
Fix a memory leak; bug 17398.
2015-10-21 08:17:07 -04:00
Nick Mathewson
a5ed8b1667
Fix compilation of sandbox.[ch] under musl-libc
...
Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347.
2015-10-15 10:37:41 -04:00
Nick Mathewson
fa4a81518a
Merge branch 'bug17347'
2015-10-15 10:36:29 -04:00
Nick Mathewson
50148dc45d
Fix compilation of sandbox.[ch] under musl-libc
...
Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347.
2015-10-15 10:35:45 -04:00
Nick Mathewson
5bd3290df3
Remove workaround code for broken client-side renegotiation
...
Since 11150 removed client-side support for renegotiation, we no
longer need to make sure we have an openssl/TLSvX combination that
supports it (client-side)
2015-10-07 10:16:37 -04:00
Nick Mathewson
6505d529a5
Remove client-side support for detecting v1 handshake
...
Fixes more of 11150
2015-10-07 10:13:39 -04:00
Nick Mathewson
2ad6e1bb0e
Make the mis-named V2_HANDSHAKE_SERVER/CLIENT macros always-on.
...
They selected the V2 handshake *and* the V3 handshake, in a strange
mixture. Both handshakes have been mandatory for a long time.
2015-10-07 10:07:29 -04:00
Nick Mathewson
bd1a137893
Remove the client-side code for the v1 and v2 tls handshakes.
...
(This is safe since super-old Tor servers are no longer allowed on
the network.)
Closes the client-side part of 11150.
2015-10-07 10:04:12 -04:00
Nick Mathewson
5a5112f701
Fix "make check-spaces"
2015-10-07 09:34:02 -04:00
Nick Mathewson
cec2bc435e
Merge remote-tracking branch 'twstrike/procmon_tests'
...
Conflicts:
src/test/include.am
src/test/log_test_helpers.c
src/test/log_test_helpers.h
2015-10-07 09:32:51 -04:00
Nick Mathewson
41782bf3ac
Merge remote-tracking branch 'tvdw/fix-16563'
2015-10-06 10:57:31 -04:00
Nick Mathewson
bfd9dccdb8
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-06 09:06:57 -04:00
Nick Mathewson
1eb838b303
Work around openssl declaring x509_get_not{Before,After} as functions
...
Now that x509_get_not{Before,After} are functions in OpenSSL 1.1
(not yet releasesd), we need to define a variant that takes a const
pointer to X509 and returns a const pointer to ASN1_time.
Part of 17237. I'm not convinced this is an openssl bug or a tor
bug. It might be just one of those things.
2015-10-06 09:04:37 -04:00
rl1987
b216340d75
Fix compilation failure when SSL_SESSION_get_master_key() is provided by OpenSSL.
2015-10-05 21:56:27 +03:00
Ola Bini
ca927b7f63
Fix spaces
2015-10-05 13:42:43 -05:00
Tom van der Woerdt
c44a94606a
Use __FUNCTION__ instead of __PRETTY_FUNCTION__
...
Fixes ticket #16563
2015-10-04 19:55:38 +02:00
Nick Mathewson
0ead9a58b9
Avoid warnings in tortls.h includes
2015-10-02 15:57:33 +02:00
Nick Mathewson
11e3db3ee8
clean up whitespace
2015-10-02 15:13:19 +02:00
Nick Mathewson
b5aa257d46
Fix "make check-spaces"
2015-10-02 14:33:54 +02:00
Nick Mathewson
39901bd408
Make test_tortls compile without warnings
2015-10-02 14:20:28 +02:00
Nick Mathewson
086c33ea61
Merge remote-tracking branch 'twstrike/tortls_tests'
2015-10-02 14:12:27 +02:00
Nick Mathewson
0e03a0421e
Fix check-spaces complaints
2015-10-02 13:22:00 +02:00
Nick Mathewson
3b09322c9b
Merge remote-tracking branch 'sebastian/bug17026'
2015-10-02 13:15:36 +02:00
Nick Mathewson
ac8c5ec67a
Clean up compat_libevent tests
2015-10-02 13:13:58 +02:00
Nick Mathewson
f774813129
Merge remote-tracking branch 'twstrike/compat_libevent_tests'
2015-10-02 12:56:37 +02:00
Peter Palfrader
335af6fed8
Document syslog_identity_tag for add_syslog_log
2015-09-30 18:34:15 +02:00
Peter Palfrader
1cf0d82280
Add SyslogIdentityTag
...
When logging to syslog, allow a tag to be added to the syslog identity
("Tor"), i.e. the string prepended to every log message. The tag can be
configured by setting SyslogIdentityTag and defaults to none. Setting
it to "foo" will cause logs to be tagged as "Tor-foo". Closes : #17194 .
2015-09-30 18:34:15 +02:00
teor (Tim Wilson-Brown)
7fa102b487
Add checks and unit tests for get_interface_address* failure
...
Ensure that either a valid address is returned in address pointers,
or that the address data is zeroed on error.
Ensure that free_interface_address6_list handles NULL lists.
Add unit tests for get_interface_address* failure cases.
Fixes bug #17173 .
Patch by fk/teor, not in any released version of tor.
2015-09-29 10:17:05 +02:00