summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2016-05-19Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-19Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8Nick Mathewson
2016-05-19Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-19Merge remote-tracking branch 'public/bug19073' into maint-0.2.8Nick Mathewson
2016-05-19Describe what happens when we get a consensus, but no certificatesteor (Tim Wilson-Brown)
Comment-only change
2016-05-19Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-19Merge branch 'bug18809_028_squashed' into maint-0.2.8Nick Mathewson
2016-05-19Add unit tests for networkstatus_consensus_is_bootstrappingteor (Tim Wilson-Brown)
2016-05-19Restore and improve download schedule unit teststeor (Tim Wilson-Brown)
2016-05-19Remove consensus_max_download_tries by refactoringteor (Tim Wilson-Brown)
No behaviour change This function is used twice. The code is simpler if we split it up and inline it where it is used.
2016-05-19Stop downloading consensuses when a consensus has been downloadedteor (Tim Wilson-Brown)
Previosuly, during bootstrap, we would continue to download consensuses if we had a consensus, but didn't have the certificates to validate it.
2016-05-17whitespace fixesNick Mathewson
2016-05-17Remove duplicate siging_key_cert fields.Nick Mathewson
With the fix for #17150, I added a duplicate certificate here. Here I remove the original location in 0.2.8. (I wouldn't want to do that in 027, due to the amount of authority-voting-related code drift.) Closes 19073.
2016-05-17Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-17Merge branch 'bug17150_027_extra' into maint-0.2.8Nick Mathewson
2016-05-17Improve API of routerinfo_incompatible_with_extrainfo()Nick Mathewson
This API change makes it so that routerinfo_incompatible...() no longer takes a routerinfo_t, so that it's obvious that it should only look at fields from the signed_descriptor_t. This change should prevent a recurrence of #17150.
2016-05-17Fix another, more subtle, case of bug 17150.Nick Mathewson
We need to make sure that the corresponding sd and ei match in their certificates.
2016-05-17Copy the signing_key_cert field into signed_descriptor_tNick Mathewson
We need this field to be in signed_descriptor_t so that routerinfo_incompatible_with_extrainfo can work correctly (#17150). But I don't want to move it completely in this patch, since a great deal of the code that messes with it has been in flux since 0.2.7, when this ticket was opened. I should open another ticket about removing the field from routerinfo_t and extrainfo_t later on. This patch fixes no actual behavior.
2016-05-17Fix documentation for routerinfo_incompatible_with_extrainfoNick Mathewson
2016-05-17When making sure digest256 matches in ei, look at sd, not ri.Nick Mathewson
The routerinfo we pass to routerinfo_incompatible_with_extrainfo is the latest routerinfo for the relay. The signed_descriptor_t, on the other hand, is the signed_descriptor_t that corresponds to the extrainfo. That means we should be checking the digest256 match with that signed_descriptor_t, not with the routerinfo. Fixes bug 17150 (and 19017); bugfix on 0.2.7.2-alpha.
2016-05-17Move extra_info_digest256 into signed_descriptor_tNick Mathewson
This patch includes no semantic changes; it's just a field movement. It's prerequisite for a fix to 19017/17150.
2016-05-17Merge remote-tracking branch 'teor/bug18963-remember-v2'Nick Mathewson
2016-05-17Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-17Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8Nick Mathewson
2016-05-16touchups and refactorings on bug 18616 branchRoger Dingledine
no behavior changes
2016-05-12Merge branch 'ftrapv_v3'Nick Mathewson
There were some conflicts here, and some breakage to fix concerning library link order in newer targets.
2016-05-12Move the ctime part of choose_array_element_by_weight into di_opsNick Mathewson
This way it gets the ctime options.
2016-05-12Refactor out u64_dbl_tNick Mathewson
This type saved a tiny amount of allocation, but not enough to be worth keeping. (This is in preparation for moving choose_array_element_by_weight)
2016-05-12Add -ftrapv to gcc-hardening ... mostly!Nick Mathewson
We know there are overflows in curve25519-donna-c32, so we'll have to have that one be fwrapv. Only apply the asan, ubsan, and trapv options to the code that does not need to run in constant time. Those options introduce branches to the code they instrument. (These introduced branches should never actually be taken, so it might _still_ be constant time after all, but branch predictors are complicated enough that I'm not really confident here. Let's aim for safety.) Closes 17983.
2016-05-12Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-12Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8Nick Mathewson
2016-05-11Merge remote-tracking branch 'public/bug18815'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Roger Dingledine
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Roger Dingledine
2016-05-11unbreak the build (when warnings are enabled)Roger Dingledine
2016-05-11Merge branch 'ticket16698_v2'Nick Mathewson
2016-05-11Fix comment for directory_handle_command_getNick Mathewson
2016-05-11Fetch certificates from the same directory as previous certificatesteor (Tim Wilson-Brown)
Improves the fix to #18963.
2016-05-11Fetch certificates from the same directory as the consensusteor (Tim Wilson-Brown)
Resolves ticket 18963; fix on #4483 in 0.2.8.1-alpha.
2016-05-11Merge remote-tracking branch 'arma/feature18760'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8Nick Mathewson
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-05-11Fix out-of-bounds write during voting with duplicate ed25519 keysJohn Brooks
In dirserv_compute_performance_thresholds, we allocate arrays based on the length of 'routers', a list of routerinfo_t, but loop over the nodelist. The 'routers' list may be shorter when relays were filtered by routers_make_ed_keys_unique, leading to an out-of-bounds write on directory authorities. This bug was originally introduced in 26e89742, but it doesn't look possible to trigger until routers_make_ed_keys_unique was introduced in 13a31e72. Fixes bug 19032; bugfix on tor 0.2.8.2-alpha.
2016-05-11Confim we want certificates from fallbacksteor (Tim Wilson-Brown)
Comment-only change
2016-05-11Revert "Switch between fallback and authority when auth cert fetch fails"teor (Tim Wilson-Brown)
This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b.
2016-05-11refactor the #19003 patchesRoger Dingledine
fix the logic in one of the comments
2016-05-11Merge branch 'maint-0.2.8'Nick Mathewson
2016-05-11Merge branch 'bug18761_028_squashed' into maint-0.2.8Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion