summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-21Add TROVE-2019-001 to changelog for 0.4.0.2-alphator-0.4.0.2-alphaNick Mathewson
2019-02-21Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-02-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21kist: Don't write above the highwater outbuf markDavid Goulet
KIST works by computing how much should be allowed to write to the kernel for a given socket, and then it writes that amount to the outbuf. The problem is that it could be possible that the outbuf already has lots of data in it from a previous scheduling round (because the kernel is full/busy and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf has been filling (is above its "highwater") and writes more anyway. The end result is that the outbuf length would exceed INT_MAX, hence causing an assertion error and a corresponding "Bug()" message to get printed to the logs. This commit makes it for KIST to take into account the outbuf length when computing the available space. Bug found and patch by Rob Jansen. Closes #29168. TROVE-2019-001. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-02-21Bump version to 0.4.0.2-alphaNick Mathewson
2019-02-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.5.8Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-21Use standard format for 0.4.0.2-alpha headerNick Mathewson
2019-02-21Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-02-21Fix a goofy change from abcde10fce that broke test-slow linkingNick Mathewson
boklm tracked this down, and it doesn't make sense. It caused This change goes back to the previous LDFLAGS line.
2019-02-20Start work on an 0.4.0.2-alpha changelog.Nick Mathewson
2019-02-20Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0Roger Dingledine
2019-02-20Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0Roger Dingledine
2019-02-20fix typos from #28614Roger Dingledine
2019-02-19Downgrade some LOG_ERR messages in the address/* tests to warningsNick Mathewson
Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Bug not in any released Tor.
2019-02-19Mark map_anon_nofork test as skipped in 0.4.0Nick Mathewson
This test fails in some environments; since the code isn't used in 0.4.0, let's disable it for now. Band-aid solution for #29534; bug not in any released Tor.
2019-02-19Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0Nick Mathewson
2019-02-19Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0Nick Mathewson
2019-02-19Merge branch 'bug29145_029' into maint-0.4.0Nick Mathewson
2019-02-19Fix a compiler warning on OpenBSDKris Katterjohn
malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-19Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0Nick Mathewson
2019-02-19Merge branch 'bug28698_035' into maint-0.4.0Nick Mathewson
2019-02-19Add circuit time check before logging about relaxing circuit timeJosé M. Guisado
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-02-19Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0Nick Mathewson
2019-02-17fix a bootstrapping string typoRoger Dingledine
introduced in 85542ee5 next step is to fix it in torspec too
2019-02-17fix some of the typos in Maintaining.mdRoger Dingledine
2019-02-16Make test-slow compile with libeventNeel Chauhan
2019-02-15Remove check-tor scriptrl1987
2019-02-14kist: When readding chans, check correct chan's sched_heap_idxMatt Traudt
Closes #29508 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-14Merge branch 'tor-github/pr/702'David Goulet
2019-02-14Merge branch 'maint-0.3.5'George Kadianakis
2019-02-14Merge branch 'tor-github/pr/689' into maint-0.3.5George Kadianakis
2019-02-14Merge branch 'maint-0.3.5'George Kadianakis
2019-02-14Merge branch 'tor-github/pr/536' into maint-0.3.5George Kadianakis
2019-02-14Add whitebox test for the long-output optimization of fast_rngNick Mathewson
2019-02-14Add test for crypto_fast_rng_get_double().Nick Mathewson
2019-02-14Add a test-rng program so we can pipe to dieharder.Nick Mathewson
2019-02-14Add a benchmark for our several PRNGs.Nick Mathewson
2019-02-14Implement a fast aes-ctr prngNick Mathewson
This module is currently implemented to use the same technique as libottery (later used by the bsds' arc4random replacement), using AES-CTR-256 as its underlying stream cipher. It's backtracking- resistant immediately after each call, and prediction-resistant after a while. Here's how it works: We generate psuedorandom bytes using AES-CTR-256. We generate BUFLEN bytes at a time. When we do this, we keep the first SEED_LEN bytes as the key and the IV for our next invocation of AES_CTR, and yield the remaining BUFLEN - SEED_LEN bytes to the user as they invoke the PRNG. As we yield bytes to the user, we clear them from the buffer. Every RESEED_AFTER times we refill the buffer, we mix in an additional SEED_LEN bytes from our strong PRNG into the seed. If the user ever asks for a huge number of bytes at once, we pull SEED_LEN bytes from the PRNG and use them with our stream cipher to fill the user's request.
2019-02-14Extract RNG tests into a new test moduleNick Mathewson
test_crypto.c is pretty big; it wouldn't hurt to split it up some more before I start adding stuff to the PRNG tests.
2019-02-14Extract the common body of our random-int functions into a macroNick Mathewson
This is the second part of refactoring the random-int-in-range code.
2019-02-14Disable unstable circuit padding unittest.George Kadianakis
until #29298 is implemented.
2019-02-13Merge remote-tracking branch 'tor-github/pr/699'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion