summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-06-29More tweaks for windows compilation. (ick)Nick Mathewson
2015-06-29Remove checks for visual C 6.Nick Mathewson
2015-06-28fix a windows unused var warningNick Mathewson
2015-06-27Whoops; fix linux build againNick Mathewson
2015-06-27Fix some compilation issues.Nick Mathewson
2015-06-27Avoid a segfault when reading an encrypted key that isn't thereNick Mathewson
Patch from cypherpunks. Fixes bug 16449. Bug not in any released tor.
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-06-25Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-06-25Merge branch 'bug16288_027_03_squashed'Nick Mathewson
2015-06-25Validate the open file limit when creating a socketDavid Goulet
Fixes #16288 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-25Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6Nick Mathewson
2015-06-25Avoid crashing on busy/NEWNYM+hidden service clientsNick Mathewson
When we ran out of intro points for a hidden service (which could happen on a newnym), we would change the connection's state back to "waiting for hidden service descriptor." But this would make an assertion fail if we went on to call circuit_get_open_circ_or_launch again. This fixes bug 16013; I believe the bug was introduced in 38be533c69417aacf28cedec1c3bae808ce29f4, where we made it possible for circuit_get_open_circ_or_launch() to change the connection's state.
2015-06-25Merge branch 'readpassphrase_v2'Nick Mathewson
2015-06-25Remove janky getpass implementationsNick Mathewson
2015-06-25Add a getpass implementation for windows that won't totally suckNick Mathewson
The logic here is inspired by Python's win_getpass(), which I'm assuming is better than nothing.
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-25Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6Nick Mathewson
2015-06-24Work around nytimes.com's broken hostnames in our SOCKS checks.Yawning Angel
RFC 952 is approximately 30 years old, and people are failing to comply, by serving A records with '_' as part of the hostname. Since relaxing the check is a QOL improvement for our userbase, relax the check to allow such abominations as destinations, especially since there are likely to be other similarly misconfigured domains out there.
2015-06-22Repair breakage in early-error case of microdesc parsingNick Mathewson
When I fixed #11243, I made it so we would take the digest of a descriptor before tokenizing it, so we could desist from download attempts if parsing failed. But when I did that, I didn't remove an assertion that the descriptor began with "onion-key". Usually, this was enforced by "find_start_of_next_microdescriptor", but when find_start_of_next_microdescriptor returned NULL, the assertion was triggered. Fixes bug 16400. Thanks to torkeln for reporting and cypherpunks_backup for diagnosing and writing the first fix here.
2015-06-19Merge remote-tracking branch 'dgoulet/rendcache_027_01'Nick Mathewson
2015-06-19fix some memory leaks that coverity foundNick Mathewson
2015-06-18Move cache objects and functions to rendcache.{c|h}David Goulet
Every functions and objects that are used for hidden service descriptor caches are moved to rendcache.{c|h}. This commit does NOT change anything, just moving code around. Fixes #16399 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-18Add rendcache.{c|h}David Goulet
For now, rend_cache_entry_t has been moved from or.h to rendcache.h and those files have been added to the build system. In the next commit, these will contain hidden service descriptor cache ABI and API for both client and directory side. The goal is to consolidate the descriptor caches in one location to ease development, maintenance, review and improve documentation for each cache behavior and algorithm. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-18Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-18Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6Nick Mathewson
2015-06-17Handle "keygen" if datadir does not yet existNick Mathewson
2015-06-17Fix an unchecked-case warning on windowsNick Mathewson
2015-06-17Add the openssh 6.8p1 readpassphrase implementationNick Mathewson
This way glibc users don't have to fall back to getpass. Windows users are still out of luck
2015-06-17Add readpassphrase.c in src/extNick Mathewson
This is taken verbatim from openssh 6.8p1, which appears to have lightly tweaked it from the openbsd version.
2015-06-17Merge branch '13642_offline_master_v2_squashed'Nick Mathewson
2015-06-17Support encrypted offline master keys with a new --keygen flagNick Mathewson
When --keygen is provided, we prompt for a passphrase when we make a new master key; if it is nonempty, we store the secret key in a new crypto_pwbox. Also, if --keygen is provided and there *is* an encrypted master key, we load it and prompt for a passphrase unconditionally. We make a new signing key unconditionally when --keygen is provided. We never overwrite a master key.
2015-06-17Add a tor_getpass to read passphrases. Needs better backend.Nick Mathewson
2015-06-17Extend intro point to a 4th hop on cannibalizationDavid Goulet
Fixes #16260 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-17Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-17Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-06-17Correctly handle failed crypto_early_initteor
If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor".
2015-06-16Revert "Do not replace a HS descriptor with a different replica of itself"David Goulet
This reverts commit 9407040c592184e05e45a3c1a00739c2dd302288. Small fix, "e->received" had to be removed since that variable doesn't exist anymore. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-06-16Document the consensus download interval used by hidden servicesteor
In the comments in update_consensus_networkstatus_fetch_time_impl in networkstatus.c
2015-06-16Fix spacing in tortls.cteor
2015-06-15Merge remote-tracking branch 'origin/maint-0.2.6'Nick Mathewson
2015-06-15Fix another seccomp2 issueNick Mathewson
Allow pipe() and pipe2() syscalls; we need these when eventfd2() support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. Patch from "teor".
2015-06-11Add a log message to try to track down #16013Nick Mathewson
2015-06-11Fix clang address of struct member always non-NULL in SSL master keyteor
clang complains that the address of struct member in an assert in SSL_SESSION_get_master_key is always non-NULL. Instead, check each pointer argument is non-NULL before using it. Fix on f90a704f1258 from 27 May 2015, not in any released version of tor.
2015-06-10Bump version to 0.2.6.9Andrea Shepard
2015-06-09Update geoip6 to the June 3 2015 database.Karsten Loesing
2015-06-09Update geoip to the June 3 2015 database.maint-0.2.3Karsten Loesing