summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-08-28Move secret-to-key functionality into a separate moduleNick Mathewson
I'm about to add more of these, so we might as well trudge forward.
2014-08-28Rename secret_to_key to secret_to_key_rfc2440Nick Mathewson
2014-08-28Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-28Resume expanding abbreviations for command-line optionsRoger Dingledine
The fix for bug 4647 accidentally removed our hack from bug 586 that rewrote HashedControlPassword to __HashedControlSessionPassword when it appears on the commandline (which allowed the user to set her own HashedControlPassword in the torrc file while the controller generates a fresh session password for each run). Fixes bug 12948; bugfix on 0.2.5.1-alpha.
2014-08-27Initialize crash handler in unit testsNick Mathewson
This way, we don't get locking failures when we hit an assertion in the unit tests. Also, we might find out about unit test bugs from folks who can't do gdb.
2014-08-26Merge remote-tracking branch 'public/bug10163'Nick Mathewson
2014-08-25Remove the assigned-but-unused chosen_named_idx local variableNick Mathewson
It had been used in consensus method 1. But now that 13 is the minimum (see #10163), we don't need it around. Found by sysrqb.
2014-08-25Fix another memory leak case in sandbox.c:prot_strings()Nick Mathewson
This is related to the rest of 523587a5cf62119baa01822e2e783925726a790b
2014-08-24Use the ARRAY_LENGTH macro more consistently.Nick Mathewson
2014-08-24Remove the non-implemented versions of the sandbox _array() functionsNick Mathewson
2014-08-24Whitespace fixesNick Mathewson
2014-08-24Terser ways to sandbox-allow related filenamesNick Mathewson
Using the *_array() functions here confused coverity, and was actually a bit longer than we needed. Now we just use macros for the repeated bits, so that we can mention a file and a suffix-appended version in one line.
2014-08-24Merge branch 'bug11792_1_squashed'Nick Mathewson
Conflicts: src/or/circuitlist.c
2014-08-24When looking for conns to close, count the age of linked queued dataNick Mathewson
Specifically, count the age of the data queued in a linked directory connection's buffers when counting a stream's age.
2014-08-24Kill non-tunneled directory connections when handling OOM.Nick Mathewson
Another part of 11792.
2014-08-24Count zlib buffer memory towards OOM totals.Nick Mathewson
Part of 11792. (Uses the zlib-endorsed formula for memory needs for inflate/deflate from "zconf.h".)
2014-08-22Tidy status handling in rendservice.cNick Mathewson
We had some code to fix up the 'status' return value to -1 on error if it wasn't set, but it was unreachable because our code was correct. Tweak this by initializing status to -1, and then only setting it to 0 on success. Also add a goto which was missing: its absence was harmless. [CID 718614, 718616]
2014-08-21Merge branch 'coverity_20140821'Nick Mathewson
2014-08-21fix memory leak on failure in sandbox.c:prot_strings()Nick Mathewson
[CID 1205014]
2014-08-21Store sandbox params as char *, since that's what they are.Nick Mathewson
This allows coverity to infer that we aren't leaking them. [Fixes a lot of CIDs]
2014-08-21Check for duplicate arguments to tor-gencertNick Mathewson
Found by coverity, which noticed that if you said tor-gencert -i identity1 -i identity2 we would leak "identity1". [CID 1198201, 1198202, 1198203]
2014-08-21Mark one use of networkstatus_check_document_signature as (void)Nick Mathewson
Also explain why we aren't checking its return value. [CID 1198197]
2014-08-21remove meaningless checks for chunks==NULL in dirserv stuffNick Mathewson
Also, make it clearer that chunks cannot be NULL [CID 1031750, 1031751]
2014-08-21Suppress coverity warning about overflowing in safe_mem_is_zeroNick Mathewson
The unsigned underflow here is defined and intentional. CID 202482
2014-08-21Avoid performing an assert on an always-true valueNick Mathewson
This was freaking out coverity. [CID 743379]
2014-08-21Suppress coverity warning about overflowing in tor_memeq.Nick Mathewson
The unsigned underflow here is defined and intentional. CID 202482
2014-08-21Check return values for fcntl in tor_spawn_background.Nick Mathewson
[CID 718609]
2014-08-21Allow rend_service_intro_free to get called with NULLNick Mathewson
(We allowed it previously, but produced an LD_BUG message when it happened, which is not consistent Also, remove inconsistent NULL checks before calling rend_service_intro_free. (Removing the check is for CID 718613)
2014-08-21Remove a dead check for errmsg in handle_control_authenticateNick Mathewson
Coverity doesn't like doing NULL checks on things that can't be NULL; I like checking things where the logic for their not being NULL is nontrivial. Let's compromise, and make it obvious that this field can't be NULL. [Coverity CID 202004]
2014-08-21Add a missing goto to an unusable branch and make the branch LD_BUG.Nick Mathewson
(It's LD_BUG to reach this point because the hashed password values were tested earlier from options_validate) [Coverity CID 1232091]
2014-08-21Explicitly cast when dividing ints then implicitly casting to double.Nick Mathewson
Coverity thinks that when we do "double x = int1/int2;", we probably meant "double x = ((double)int1) / int2;". In these cases, we didn't. [Coverity CID 1232089 and 1232090]
2014-08-21Fix memory leaks in test_entrynodes.cNick Mathewson
[Coverity CID 1232087 and 1232088]
2014-08-21Make the two branches of tor_tls_used_v1_handshake into one.Nick Mathewson
(Coverity thinks that "if (a) X; else X;" is probably a bug.) [Coverity CID 1232086]
2014-08-20Merge branch 'bug12205_take2_squashed'Nick Mathewson
2014-08-20Whitespace fixesNick Mathewson
2014-08-20Small cleanups to test_entry_is_time_to_retryNick Mathewson
2014-08-20Unit testing entry_is_time_to_retry().rl1987
2014-08-20Write comments for members of periods array.rl1987
2014-08-20Rewriting entry_is_time_to_retry() using table approach.rl1987
2014-08-20Merge branch 'bug10116_squashed'Nick Mathewson
2014-08-20Don't allocate an extra smartlist in the OOM handlerNick Mathewson
Fixes issue 10116
2014-08-20fix remaining compilation problemsNick Mathewson
2014-08-20Fix return value of tor_fd_seekend.Nick Mathewson
Previously, we had documented it to return -1 or 0, when in fact lseek returns -1 or the new position in the file. This is harmless, since we were only checking for negative values when we used tor_fd_seekend.
2014-08-20Allow named pipes for our log files.Nick Mathewson
Closes ticket 12061. Based on a patch from "carlo von lynX" on tor-dev at https://lists.torproject.org/pipermail/tor-dev/2014-April/006705.html
2014-08-20Merge remote-tracking branch 'public/bug11787'Nick Mathewson
2014-08-20Changes file for bug 11787Nick Mathewson
2014-08-20Merge remote-tracking branch 'public/bug12908_025'Nick Mathewson
2014-08-20Warn if Tor is a relay and a HSSathyanarayanan Gunasekaran
Closes 12908; see #8742
2014-08-20Merge remote-tracking branch 'public/bug12728_024'Nick Mathewson