aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-25Mention trunnel in LICENSE and src/ext/READMENick Mathewson
2014-09-25Merge branch 'libscrypt_trunnel_squashed'Nick Mathewson
Conflicts: src/test/test_crypto.c
2014-09-25Add tests for failing cases of crypto_pwboxNick Mathewson
2014-09-25Use trunnel for crypto_pwbox encoding/decoding.Nick Mathewson
This reduces the likelihood that I have made any exploitable errors in the encoding/decoding. This commit also imports the trunnel runtime source into Tor.
2014-09-25Adjust pwbox format: use a random IV each timeNick Mathewson
Suggested by yawning
2014-09-25Test a full array of s2k flags with pwbox test.Nick Mathewson
Suggested by yawning.
2014-09-25Use preferred key-expansion means for pbkdf2, scrypt.Nick Mathewson
Use HKDF for RFC2440 s2k only.
2014-09-25Test vectors for PBKDF2 from RFC6070Nick Mathewson
2014-09-25Test vectors for scrypt from draft-josefsson-scrypt-kdf-00Nick Mathewson
2014-09-25Tweak and expose secret_to_key_compute_key for testingNick Mathewson
Doing this lets me pass in a salt of an unusual length.
2014-09-25Rudimentary-but-sufficient passphrase-encrypted box code.Nick Mathewson
See crypto_pwbox.c for a description of the file format. There are tests for successful operation, but it still needs error-case tests.
2014-09-25More generic passphrase hashing code, including scrypt supportNick Mathewson
Uses libscrypt when found; otherwise, we don't have scrypt and we only support openpgp rfc2440 s2k hashing, or pbkdf2. Includes documentation and unit tests; coverage around 95%. Remaining uncovered code is sanity-checks that shouldn't be reachable fwict.
2014-09-23two more typosRoger Dingledine
2014-09-22+ is not how we say concatenateRoger Dingledine
2014-09-22Merge remote-tracking branch 'public/bug12693_025'Nick Mathewson
2014-09-22Merge branch 'master' of git-rw.torproject.org:/torNick Mathewson
2014-09-22Merge branch 'bug8197_squashed'Nick Mathewson
Conflicts: src/test/test_policy.c
2014-09-22and forward-port those changelogs tooRoger Dingledine
2014-09-22Writing comments for newly added functions.rl1987
2014-09-22Adding changes file for 8197.rl1987
2014-09-22Whitespace fixesrl1987
2014-09-22Using the new API in unit-test.rl1987
2014-09-22New API for policies_parse_exit_policy().rl1987
2014-09-22changes file for 12884Nick Mathewson
2014-09-22Remove config options that have been obsolete since 0.2.3Adrien BAK
2014-09-22Merge remote-tracking branch 'arma/feature13211'Nick Mathewson
2014-09-22Merge remote-tracking branch 'arma/feature13153'Nick Mathewson
2014-09-22changes file for 7733Nick Mathewson
2014-09-22Merge remote-tracking branch 'public/bug7733a'Nick Mathewson
2014-09-22Merge remote-tracking branch 'intrigeri/bug13196-systemd-writable-run-directory'Nick Mathewson
2014-09-21clients use optimistic data when reaching hidden servicesRoger Dingledine
Allow clients to use optimistic data when connecting to a hidden service, which should cut out the initial round-trip for client-side programs including Tor Browser. (Now that Tor 0.2.2.x is obsolete, all hidden services should support server-side optimistic data.) See proposal 181 for details. Implements ticket 13211.
2014-09-21Use optimistic data even if we don't know exitnode->rsRoger Dingledine
I think we should know the routerstatus for our exit relay, since we built a circuit to it. So I think this is just a code simplication.
2014-09-21get rid of routerstatus->version_supports_optimistic_dataRoger Dingledine
Clients are now willing to send optimistic circuit data (before they receive a 'connected' cell) to relays of any version. We used to only do it for relays running 0.2.3.1-alpha or later, but now all relays are new enough. Resolves ticket 13153.
2014-09-21get rid of trivial redundant commentRoger Dingledine
2014-09-21Stop silently skipping invalid args to seteventsRoger Dingledine
Return an error when the second or later arguments of the "setevents" controller command are invalid events. Previously we would return success while silently skipping invalid events. Fixes bug 13205; bugfix on 0.2.3.2-alpha. Reported by "fpxnns".
2014-09-20Merge branch 'maint-0.2.5'Roger Dingledine
2014-09-20Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
Conflicts: src/or/config.c
2014-09-20Merge branch 'maint-0.2.3' into maint-0.2.4Roger Dingledine
2014-09-20gabelmoo's IPv4 address changedSebastian Hahn
2014-09-19Add changes file for #13196.intrigeri
Note that this will likely need to be folded with the changes file for #12751, as this change is a mere fixup on top of the changes introduced for #12751.
2014-09-19systemd unit file: set up /var/run/tor as writable for the Tor service.intrigeri
For some strange reason, this was not needed with systemd v208. But it's needed with systemd v215 on current Debian sid, and entirely makes sense.
2014-09-18Merge branch 'bug4244b_squashed'Nick Mathewson
2014-09-18Clients no longer write "DirReqStatistics 0" in their saveconf outputRoger Dingledine
Stop modifying the value of our DirReqStatistics torrc option just because we're not a bridge or relay. This bug was causing Tor Browser users to write "DirReqStatistics 0" in their torrc files as if they had chosen to change the config. Fixes bug 4244; bugfix on 0.2.3.1-alpha.
2014-09-18Fix a double-free in failing case of handle_control_authenticate.Nick Mathewson
Bugfix on ed8f020e205267e6270494634346ab68d830e1d8; bug not in any released version of Tor. Found by Coverity; this is CID 1239290.
2014-09-18Use the DL_SCHED_CONSENSUS schedule for consensuses.Nick Mathewson
Fixes bug 11679; bugfix on 0.2.2.6-alpha
2014-09-18Activate INSTRUMENT_DOWNLOADS under clang analyzer as well as coverityNick Mathewson
Patch from teor; ticket 13177.
2014-09-17Fix a windows unused-arg warningNick Mathewson
2014-09-17Merge remote-tracking branch 'public/ticket_13119_v3'Nick Mathewson
2014-09-16torrc.sample: Fix unitsPeter Palfrader
2014-09-16Ignore coverage_html/Arlo Breault
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion