summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
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 remote-tracking branch 'public/bug16400_026' into maint-0.2.6Nick Mathewson
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-18Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6Nick 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-08HSDir flag now requires the Stable flagDavid Goulet
Fixes #8243
2015-06-04Set session_group after the port's data structure has been populated.Yawning Angel
Fixes #16247, patch by "jojelino".
2015-06-02Fix sandboxing to work when running as a relayPeter Palfrader
This includes correctly allowing renaming secret_id_key and allowing the eventfd2 and futex syscalls. Fixes bug 16244; bugfix on 0.2.6.1-alpha.
2015-05-13Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-05-05Fix out-of-bounds read in INTRODUCE2 client authJohn Brooks
The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized (1 or 2), but not for any other non-zero auth_type. Later, auth_data is assumed to have at least REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds read. Fixed by checking auth_len before comparing the descriptor cookie against known clients. Fixes #15823; bugfix on 0.2.1.6-alpha.
2015-04-28Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"David Goulet
Fixes #15850, part of #15801. Change file is added by this commit. The original comment in the reverted commit is removed because right now we *need* a DirPort until #15849 is implemented so no doubt nor confusion there anymore. This reverts commit 80bed1ac96a3035f8c55ddced5528f0d7d16d386. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-04-06Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-04-06Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-06Handle empty/zero length encoded intro points more gracefully.Yawning Angel
In theory these should never the triggered as the only caller now validates the parameters before this routine gets called.
2015-04-06Treat empty introduction points sections as missing.Yawning Angel
Found by DonnchaC.
2015-04-06Validate the RSA key size received when parsing INTRODUCE2 cells.Yawning Angel
Fixes bug 15600; reported by skruffy
2015-04-03Decrease the amount of rend circ relaunches for hidden services.George Kadianakis
2015-04-03Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-04-03Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-03Merge branch 'bug15515_024' into maint-0.2.4Nick Mathewson
2015-04-03... and if we do get multiple INTRODUCE1s on a circuit, kill the circuitGeorge Kadianakis
(Sending a nak would be pointless.) See ticket 15515 for discussion.
2015-04-03Block multiple introductions on the same intro circuit.George Kadianakis
2015-03-14Simplify the loop.Nick Mathewson
2015-03-14Add comments for new functionsNick Mathewson
2015-03-14remove a needless "if (1)" that was there for indentation; fix indentation.Nick Mathewson
2015-03-14Extract main part of main loop into a separate functionNick Mathewson
For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
2015-03-12Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6Nick Mathewson
2015-03-12Initialize the extorport auth cookie before launching PTs.Yawning Angel
PTs expect the auth cookie to be available immedieately after launch, leading to a race condition when PTs opt to cache the extorport cookie once immediately after startup. Fixes #15240.
2015-03-12Revert "Make TransProxyType ipfw work correctly"Nick Mathewson
This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.)
2015-03-12Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5Nick Mathewson
2015-03-12add an explanatory commentNick Mathewson
2015-03-12Also, add an assertion to assign_onionskin_to_cpuworkerNick Mathewson
2015-03-12Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.Nick Mathewson
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
2015-03-10Add link protocol version counts to the heartbeat messageNick Mathewson
Closes ticket 15212
2015-03-09Restore c89 in 0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5Nick Mathewson
2015-03-09GETINFO bw-event-cache to get information on recent BW eventsNick Mathewson
Closes 14128; useful to regain functionality lost because of 13988.
2015-03-09Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-03-04Revert "Missing dependencies; fixes 15127."Nick Mathewson
This reverts commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605.
2015-03-04Make boostrap events include hostname ANDaddr AND digestNick Mathewson
2015-03-04Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6Nick Mathewson
2015-03-04Make TransProxyType ipfw work correctlyNick Mathewson
Fixes bug 15064; bugfix on 0.2.5.4-alpha.
2015-03-04Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6Nick Mathewson