summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-09-24Add more quotes in the test scriptsNick Mathewson
2015-09-24Stop trying to generate test scripts via autoconf substitution.Nick Mathewson
Use environment variables instead. This repairs 'make distcheck', which was running into trouble when it tried to chmod the generated scripts. Fixes 17148.
2015-09-24Increment version.Nick Mathewson
2015-09-24Merge branch 'underpinning_squashed'Nick Mathewson
2015-09-24Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-09-24Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-09-24Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-09-24Update geoip and geoip6 to the September 3 2015 database.Karsten Loesing
2015-09-23New AuthDirPinKeys option to enable/disable keypinning enforcementNick Mathewson
Implements ticket #17135. We're going to need this one to avoid chaos as everybody figures out how ed25519 keys work.
2015-09-23Extract the add-or-replace-keypin logic into a new functionNick Mathewson
We're about to need to call it in another place too.
2015-09-23Allow conflicts to occur in keypinning journalNick Mathewson
When we find a conflict in the keypinning journal, treat the new entry as superseding all old entries that overlap either of its keys. Also add a (not-yet-used) configuration option to disable keypinning enforcement.
2015-09-22add a README to src/configNick Mathewson
2015-09-22Fix a memory leak in router_parse_addr_policy_item_from_string. CID 1324770Nick Mathewson
2015-09-22Merge branch 'feature16769_squashed'Nick Mathewson
2015-09-22Disable --master-key as not-yet-working for 0.2.7Nick Mathewson
2015-09-22Add a --master-key optionNick Mathewson
This lets the user override the default location for the master key when used with --keygen Part of 16769.
2015-09-22Add a new --newpass option to add or remove secret key passphrases.Nick Mathewson
2015-09-22Merge branch 'feature16944_v2'Nick Mathewson
2015-09-22Update private ExitPolicy in man page and torrcs for 10727, formattingteor (Tim Wilson-Brown)
Update the definition of the private exit policy in the man page and torrcs. It didn't get merged correctly into the man page, and it was incomplete in the torrcs. (Unfortunately, we only reject the primary configured IPv4 and IPv6 addresses, not all configured IPv4 and IPv6 addresses.) Also fixup msn page formatting errors from changes in tickets 16069 and 17027, mainly unescaped *s.
2015-09-22Update docs with advice for separate IPv4 and IPv6 exit policiesteor (Tim Wilson-Brown)
Advise users how to configure separate IPv4 and IPv6 exit policies in the manpage and sample torrcs. Related to fixes in ticket #16069 and #17027. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-16Merge remote-tracking branch 'public/bug17047'Nick Mathewson
2015-09-16Merge remote-tracking branch 'teor/bug16069-bug17027'Nick Mathewson
2015-09-16Don't enable SSE2 on X86-64.Sebastian Hahn
This removes a comment presumably introduced for debugging that was left in accidentally. Bug not in any released version of Tor. Fixes bug 17092.
2015-09-16Merge branch 'bug17027-reject-private-all-interfaces-v2' into bug16069-bug17027teor (Tim Wilson-Brown)
src/test/test_policy.c: Merged calls to policies_parse_exit_policy by adding additional arguments. fixup to remaining instance of ~EXIT_POLICY_IPV6_ENABLED. Compacting logic test now produces previous list length of 4, corrected this. src/config/torrc.sample.in: src/config/torrc.minimal.in-staging: Merged torrc modification dates in favour of latest.
2015-09-16fixup Clarify ambiguous log message in router_add_exit_policyteor (Tim Wilson-Brown)
2015-09-16fixup Only set TAPMP_STAR_IPV6_ONLY if TAPMP_EXTENDED_STAR is setteor (Tim Wilson-Brown)
Also fix a comment.
2015-09-16Log an info-level message for each IP blocked by ExitPolicyRejectPrivateteor (Tim Wilson-Brown)
Log an info-level message containing the reject line added to the exit policy for each local IP address blocked by ExitPolicyRejectPrivate: - Published IPv4 and IPv6 addresses - Publicly routable IPv4 and IPv6 interface addresses
2015-09-16ExitPolicyRejectPrivate rejects local IPv6 address and interface addressesteor (Tim Wilson-Brown)
ExitPolicyRejectPrivate now rejects more local addresses by default: * the relay's published IPv6 address (if any), and * any publicly routable IPv4 or IPv6 addresses on any local interfaces. This resolves a security issue for IPv6 Exits and multihomed Exits that trust connections originating from localhost. Resolves ticket 17027. Patch by "teor". Patch on 42b8fb5a1523 (11 Nov 2007), released in 0.2.0.11-alpha.
2015-09-16fixup add malformed_list to unit tests from d3358a0a05f6 IPv6 wildcardsteor (Tim Wilson-Brown)
The unit tests added in e033d5e90bcb got malformed_list added to router_parse_addr_policy_item_from_string calls, but unit tests from subsequent commits didn't get the extra argument until now.
2015-09-16ExitPolicy accept6/reject6 produces IPv6 wildcard addresses onlyteor (Tim Wilson-Brown)
In previous versions of Tor, ExitPolicy accept6/reject6 * produced policy entries for IPv4 and IPv6 wildcard addresses. To reduce operator confusion, change accept6/reject6 * to only produce an IPv6 wildcard address. Resolves bug #16069. Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-16Warn about redundant torrc ExitPolicy lines due to accept/reject *:*teor (Tim Wilson-Brown)
Tor now warns when ExitPolicy lines occur after accept/reject *:* or variants. These lines are redundant, and were always ignored. Partial fix for ticket 16069. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-16Ignore accept6/reject6 IPv4, warn about unexpected rule outcomesteor (Tim Wilson-Brown)
When parsing torrc ExitPolicies, we now warn if: * an IPv4 address is used on an accept6 or reject6 line. The line is ignored, but the rest of the policy items in the list are used. (accept/reject continue to allow both IPv4 and IPv6 addresses in torrcs.) * a "private" address alias is used on an accept6 or reject6 line. The line filters both IPv4 and IPv6 private addresses, disregarding the 6 in accept6/reject6. When parsing torrc ExitPolicies, we now issue an info-level message: * when expanding an accept/reject * line to include both IPv4 and IPv6 wildcard addresses. In each instance, usage advice is provided to avoid the message. Partial fix for ticket 16069. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-15Add get_interface_address[6]_list for a list of interface IP addressesteor (Tim Wilson-Brown)
Add get_interface_address[6]_list by refactoring get_interface_address6. Add unit tests for new and existing functions. Preparation for ticket 17027. Patch by "teor". Patch on 42b8fb5a1523 (11 Nov 2007), released in 0.2.0.11-alpha.
2015-09-14Update comments about ExitPolicy parsingteor (Tim Wilson-Brown)
Fix incomplete and incorrect comments. Comment changes only.
2015-09-13Convince coverity that we do not have a particular memory leakNick Mathewson
2015-09-13Use SSL_get_client_ciphers() on openssl 1.1+, not SSL_get_ciphers...Nick Mathewson
(which isn't correct.) Fixes bug 17047; bugfix on 0.2.7.2-alpha, introduced by the merge in 0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb, apparently.
2015-09-11Add a rend cache failure info dup functionDavid Goulet
When validating a new descriptor against our rend cache failure, we were added the failure entry to the new cache entry without duplicating. It was then freed just after the validation ending up in a very bad memory state that was making tor abort(). To fix this, a dup function has been added and used just before adding the failure entry. Fixes #17041 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-09-10Merge remote-tracking branch 'public/ed25519_hup_v2'Nick Mathewson
2015-09-09Bump default test-network bootstrap time to 35 sec (see 16953)Nick Mathewson
2015-09-09Check NoKeepAliveIsolateSOCKSAuth in a better place.Yawning Angel
No functional changes, but since NoKeepAliveIsolateSOCKSAuth isn't part of isoflag, it should be checked where all other similar options are, and bypass the (no-op) masking at the end.
2015-09-08Merge remote-tracking branch 'teor/make-test-network-all'Nick Mathewson
2015-09-09Increase default boostrap time in test-network.shteor (Tim Wilson-Brown)
Increase default boostrap time in test-network.sh to 30 seconds, for larger networks like bridges+ipv6+hs. This avoids the failure-hiding issues inherent in the retry approach in #16952.
2015-09-08Make NoKeepAliveIsolateSOCKSAuth work as expectedNick Mathewson
2015-09-08Merge branch 'feature15482_squashed'Nick Mathewson
2015-09-08Add `KeepAliveIsolateSOCKSAuth` as a SOCKSPort option.Yawning Angel
This controls the circuit dirtyness reset behavior added for Tor Browser's user experience fix (#15482). Unlike previous iterations of this patch, the tunable actually works, and is documented.
2015-09-08Handle negative inputs to crypto_random_time_range().Nick Mathewson
(These inputs are possible when Shadow starts the world at time_t 0, and breaks our assumption that Tor didn't exist in the 1970s.) Fixes regression introduced in 241e6b09. Fixes #16980.
2015-09-08Add "make test-network-all" to verify multiple test networksteor (Tim Wilson-Brown)
make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08Make test-network.sh more robust against arguments containing spacesteor (Tim Wilson-Brown)
2015-09-04Never ever try to load the secret key if offline_master is setNick Mathewson
(Not even if we can't find the public key.)
2015-09-04Add "OfflineMasterKey" optionNick Mathewson
When this is set, and Tor is running as a relay, it will not generate or load its secret identity key. You can manage the secret identity key with --keygen. Implements ticket 16944.