January 2019 - tor-commits - lists.torproject.org

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit 7e98ad782d8de1554b498c39cb64b72c20f40d71 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 14 21:15:59 2019 +0000 Update translations for liveusb-creator_completed --- en_GB/en_GB.po | 88 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 2cf529c3d..87731308e 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -5,7 +5,7 @@ # Translators: # Andi Chandler <andi(a)gowling.com>, 2014-2015,2017,2019 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 -# Max / Foorack, 2015 +# Max Faxälv (Foorack), 2015 # Isabell Long <isabell(a)issyl0.co.uk>, 2015 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-20 12:34+0200\n" -"PO-Revision-Date: 2019-01-02 02:07+0000\n" +"POT-Creation-Date: 2019-01-02 09:26+0100\n" +"PO-Revision-Date: 2019-01-14 20:50+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -301,73 +301,83 @@ msgstr "Installation complete! (%s)" msgid "Tails installation failed!" msgstr "Tails installation failed!" -#: ../tails_installer/gui.py:361 +#: ../tails_installer/gui.py:369 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the \"Run this program as an administrator\" box." -#: ../tails_installer/gui.py:373 +#: ../tails_installer/gui.py:381 msgid "Tails Installer" msgstr "Tails Installer" -#: ../tails_installer/gui.py:423 ../data/tails-installer.ui.h:2 +#: ../tails_installer/gui.py:441 +msgid "Tails Installer is deprecated" +msgstr "Tails Installer is deprecated" + +#: ../tails_installer/gui.py:443 +msgid "" +"To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\n" +"To upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." +msgstr "To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\nTo upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." + +#: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" msgstr "Clone the current Tails" -#: ../tails_installer/gui.py:430 ../data/tails-installer.ui.h:3 +#: ../tails_installer/gui.py:457 ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" msgstr "Use a downloaded Tails ISO image" -#: ../tails_installer/gui.py:467 ../tails_installer/gui.py:788 +#: ../tails_installer/gui.py:494 ../tails_installer/gui.py:815 msgid "Upgrade" msgstr "Upgrade" -#: ../tails_installer/gui.py:469 +#: ../tails_installer/gui.py:496 msgid "Manual Upgrade Instructions" msgstr "Manual Upgrade Instructions" -#: ../tails_installer/gui.py:471 +#: ../tails_installer/gui.py:498 msgid "https://tails.boum.org/upgrade/" msgstr "https://tails.boum.org/upgrade/" -#: ../tails_installer/gui.py:479 ../tails_installer/gui.py:700 -#: ../tails_installer/gui.py:765 ../data/tails-installer.ui.h:7 +#: ../tails_installer/gui.py:506 ../tails_installer/gui.py:727 +#: ../tails_installer/gui.py:792 ../data/tails-installer.ui.h:7 msgid "Install" msgstr "Install" -#: ../tails_installer/gui.py:482 ../data/tails-installer.ui.h:1 +#: ../tails_installer/gui.py:509 ../data/tails-installer.ui.h:1 msgid "Installation Instructions" msgstr "Installation Instructions" -#: ../tails_installer/gui.py:484 +#: ../tails_installer/gui.py:511 msgid "https://tails.boum.org/install/" msgstr "https://tails.boum.org/install/" -#: ../tails_installer/gui.py:490 +#: ../tails_installer/gui.py:517 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)" -#: ../tails_installer/gui.py:502 +#: ../tails_installer/gui.py:529 msgid "No ISO image selected" msgstr "No ISO image selected" -#: ../tails_installer/gui.py:503 +#: ../tails_installer/gui.py:530 msgid "Please select a Tails ISO image." msgstr "Please select a Tails ISO image." -#: ../tails_installer/gui.py:545 +#: ../tails_installer/gui.py:572 msgid "No device suitable to install Tails could be found" msgstr "No device suitable to install Tails could be found" -#: ../tails_installer/gui.py:547 +#: ../tails_installer/gui.py:574 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." msgstr "Please plug a USB flash drive or SD card of at least %0.1f GB." -#: ../tails_installer/gui.py:581 +#: ../tails_installer/gui.py:608 #, python-format msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " @@ -375,49 +385,49 @@ msgid "" "different model." msgstr "The USB stick \"%(pretty_name)s\" is configured as non-removable by its manufacturer and Tails will fail to start on it. Please try installing on a different model." -#: ../tails_installer/gui.py:591 +#: ../tails_installer/gui.py:618 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least %(size)s GB is required)." -#: ../tails_installer/gui.py:604 +#: ../tails_installer/gui.py:631 #, python-format msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "https://tails.boum.org/install/download" msgstr "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\nhttps://tails.boum.org/install/download" -#: ../tails_installer/gui.py:625 +#: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" msgstr "An error happened while installing Tails" -#: ../tails_installer/gui.py:637 +#: ../tails_installer/gui.py:664 msgid "Refreshing releases..." msgstr "Refreshing releases..." -#: ../tails_installer/gui.py:642 +#: ../tails_installer/gui.py:669 msgid "Releases updated!" msgstr "Releases updated!" -#: ../tails_installer/gui.py:695 +#: ../tails_installer/gui.py:722 msgid "Installation complete!" msgstr "Installation complete!" -#: ../tails_installer/gui.py:711 +#: ../tails_installer/gui.py:738 msgid "Cancel" msgstr "Cancel" -#: ../tails_installer/gui.py:747 +#: ../tails_installer/gui.py:774 msgid "Unable to mount device" msgstr "Unable to mount device" -#: ../tails_installer/gui.py:754 ../tails_installer/gui.py:787 +#: ../tails_installer/gui.py:781 ../tails_installer/gui.py:814 msgid "Confirm the target USB stick" msgstr "Confirm the target USB stick" -#: ../tails_installer/gui.py:755 +#: ../tails_installer/gui.py:782 #, python-format msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" @@ -425,48 +435,48 @@ msgid "" "All data on this USB stick will be lost." msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)\n\nAll data on this USB stick will be lost." -#: ../tails_installer/gui.py:774 +#: ../tails_installer/gui.py:801 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" msgstr "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -#: ../tails_installer/gui.py:782 +#: ../tails_installer/gui.py:809 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." msgstr "\n\nThe persistent storage on this USB stick will be preserved." -#: ../tails_installer/gui.py:783 +#: ../tails_installer/gui.py:810 #, python-format msgid "%(description)s%(persistence_message)s" msgstr "%(description)s%(persistence_message)s" -#: ../tails_installer/gui.py:826 +#: ../tails_installer/gui.py:853 msgid "Download complete!" msgstr "Download complete!" -#: ../tails_installer/gui.py:830 +#: ../tails_installer/gui.py:857 msgid "Download failed: " msgstr "Download failed: " -#: ../tails_installer/gui.py:831 +#: ../tails_installer/gui.py:858 msgid "You can try again to resume your download" msgstr "You can try again to resume your download" -#: ../tails_installer/gui.py:839 +#: ../tails_installer/gui.py:866 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "The selected file is unreadable. Please fix its permissions or select another file." -#: ../tails_installer/gui.py:845 +#: ../tails_installer/gui.py:872 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Unable to use the selected file. You may have better luck if you move your ISO to the root of your drive (ie: C:\\)" -#: ../tails_installer/gui.py:851 +#: ../tails_installer/gui.py:878 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s selected"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit 570787cdf9d5969207c163dd524b5ba0d38492df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 14 21:15:54 2019 +0000 Update translations for liveusb-creator --- en_GB/en_GB.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 35c3d8d2a..87731308e 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -5,7 +5,7 @@ # Translators: # Andi Chandler <andi(a)gowling.com>, 2014-2015,2017,2019 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 -# Max / Foorack, 2015 +# Max Faxälv (Foorack), 2015 # Isabell Long <isabell(a)issyl0.co.uk>, 2015 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-02 13:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-01-14 20:50+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -314,13 +314,13 @@ msgstr "Tails Installer" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated" -msgstr "" +msgstr "Tails Installer is deprecated" #: ../tails_installer/gui.py:443 msgid "" "To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\n" "To upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." -msgstr "" +msgstr "To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\nTo upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit d4ab1aa03cb09f43b0ad2b79623bd50b4b174cbe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 14 21:15:48 2019 +0000 Update translations for https_everywhere_completed --- en_GB/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/https-everywhere.dtd b/en_GB/https-everywhere.dtd index 3b4b02e3a..06566073d 100644 --- a/en_GB/https-everywhere.dtd +++ b/en_GB/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Show Counter"> <!ENTITY https-everywhere.menu.viewAllRules "View All Rules">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit ff448b28b6e28a4c3308cff7cb235360f14d5643 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 14 20:15:36 2019 +0000 Update translations for https_everywhere --- es_CO/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_CO/https-everywhere.dtd b/es_CO/https-everywhere.dtd index de134cb66..8c97de619 100644 --- a/es_CO/https-everywhere.dtd +++ b/es_CO/https-everywhere.dtd @@ -1,7 +1,7 @@ <!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> -<!ENTITY https-everywhere.about.version "Version"> +<!ENTITY https-everywhere.about.version "Versión"> <!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> <!ENTITY https-everywhere.about.add_new_rule "Añadir nueva regla"> @@ -37,7 +37,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conecciones encriptadas para estos sitios web:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones encriptadas para estos sitios web:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas experimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Puede causar advertencias o roturas. Deshabilitado por defecto."> <!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site">

1 0

[tor/master] Provide a smartlist reverse-order traversal.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 3ba7581129dcffb16cca2aa8cfc2bd0fa4c8dd06 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Oct 23 19:23:09 2018 +0000 Provide a smartlist reverse-order traversal. We need this for padding negotiation so that we can have later machine revisions supercede earlier ones. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/lib/smartlist_core/smartlist_foreach.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib/smartlist_core/smartlist_foreach.h b/src/lib/smartlist_core/smartlist_foreach.h index 54f08ac47..14f2930c9 100644 --- a/src/lib/smartlist_core/smartlist_foreach.h +++ b/src/lib/smartlist_core/smartlist_foreach.h @@ -83,6 +83,14 @@ ++var ## _sl_idx) { \ var = (sl)->list[var ## _sl_idx]; +#define SMARTLIST_FOREACH_REVERSE_BEGIN(sl, type, var) \ + STMT_BEGIN \ + int var ## _sl_idx, var ## _sl_len=(sl)->num_used; \ + type var; \ + for (var ## _sl_idx = var ## _sl_len-1; var ## _sl_idx >= 0; \ + --var ## _sl_idx) { \ + var = (sl)->list[var ## _sl_idx]; + #define SMARTLIST_FOREACH_END(var) \ var = NULL; \ (void) var ## _sl_idx; \

1 0

[tor/master] Initialize circuit padding machines and global state.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 70e9245f6feecceee96f0ea8d426e1a5a6fc9b8d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Oct 23 20:52:43 2018 +0000 Initialize circuit padding machines and global state. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/app/main/main.c | 10 ++++++++-- src/feature/nodelist/networkstatus.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index d71e43ec3..ba2dfebd7 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -22,6 +22,7 @@ #include "core/mainloop/netstatus.h" #include "core/or/channel.h" #include "core/or/channelpadding.h" +#include "core/or/circuitpadding.h" #include "core/or/channeltls.h" #include "core/or/circuitlist.h" #include "core/or/circuitmux_ewma.h" @@ -645,9 +646,13 @@ tor_init(int argc, char *argv[]) /* The options are now initialised */ const or_options_t *options = get_options(); - /* Initialize channelpadding parameters to defaults until we get - * a consensus */ + /* Initialize channelpadding and circpad parameters to defaults + * until we get a consensus */ channelpadding_new_consensus_params(NULL); + circpad_new_consensus_params(NULL); + + /* Initialize circuit padding to defaults+torrc until we get a consensus */ + circpad_machines_init(); /* Initialize predicted ports list after loading options */ predicted_ports_init(); @@ -766,6 +771,7 @@ tor_free_all(int postfork) dns_free_all(); clear_pending_onions(); circuit_free_all(); + circpad_machines_free(); entry_guards_free_all(); pt_free_all(); channel_tls_free_all(); diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 65ea3cc49..3245c8ff1 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -44,6 +44,7 @@ #include "core/mainloop/netstatus.h" #include "core/or/channel.h" #include "core/or/channelpadding.h" +#include "core/or/circuitpadding.h" #include "core/or/circuitmux.h" #include "core/or/circuitmux_ewma.h" #include "core/or/circuitstats.h" @@ -2103,6 +2104,7 @@ networkstatus_set_current_consensus(const char *consensus, circuit_build_times_new_consensus_params( get_circuit_build_times_mutable(), c); channelpadding_new_consensus_params(c); + circpad_new_consensus_params(c); } /* Reset the failure count only if this consensus is actually valid. */

1 0

[tor/master] Circuit padding ProtoVer plumbing.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 659a4f06d46a0e8e4f391eda3b6d86f2ab6e4db9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Oct 23 20:55:10 2018 +0000 Circuit padding ProtoVer plumbing. This helps us to determine if a middle node can pad to us or not. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/core/or/or.h | 4 ++++ src/core/or/protover.c | 7 ++++++- src/core/or/protover.h | 1 + src/core/or/versions.c | 2 ++ src/feature/nodelist/nodelist.c | 2 +- src/rust/protover/protover.rs | 8 ++++++-- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/core/or/or.h b/src/core/or/or.h index ca373d8ed..f297bc926 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -836,6 +836,10 @@ typedef struct protover_summary_flags_t { * service rendezvous point supporting version 3 as seen in proposal 224. * This requires HSRend=2. */ unsigned int supports_v3_rendezvous_point: 1; + + /** True iff this router has a protocol list that allows clients to + * negotiate link-level padding. Requires Padding>=1. */ + unsigned int supports_padding : 1; } protover_summary_flags_t; typedef struct routerinfo_t routerinfo_t; diff --git a/src/core/or/protover.c b/src/core/or/protover.c index e80fbfae8..c0c09c9d1 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -39,6 +39,9 @@ static int protocol_list_contains(const smartlist_t *protos, static const struct { protocol_type_t protover_type; const char *name; +/* If you add a new protocol here, you probably also want to add + * parsing for it in routerstatus_parse_entry_from_string() so that + * it is set in routerstatus_t */ } PROTOCOL_NAMES[] = { { PRT_LINK, "Link" }, { PRT_LINKAUTH, "LinkAuth" }, @@ -49,6 +52,7 @@ static const struct { { PRT_HSREND, "HSRend" }, { PRT_DESC, "Desc" }, { PRT_MICRODESC, "Microdesc"}, + { PRT_PADDING, "Padding"}, { PRT_CONS, "Cons" } }; @@ -396,7 +400,8 @@ protover_get_supported_protocols(void) "LinkAuth=3 " #endif "Microdesc=1-2 " - "Relay=1-2"; + "Relay=1-2 " + "Padding=1"; } /** The protocols from protover_get_supported_protocols(), as parsed into a diff --git a/src/core/or/protover.h b/src/core/or/protover.h index 7319d2f8c..ffd4f2c18 100644 --- a/src/core/or/protover.h +++ b/src/core/or/protover.h @@ -43,6 +43,7 @@ typedef enum protocol_type_t { PRT_DESC, PRT_MICRODESC, PRT_CONS, + PRT_PADDING, } protocol_type_t; bool protover_contains_long_protocol_names(const char *s); diff --git a/src/core/or/versions.c b/src/core/or/versions.c index 7bd1f5899..736313a9c 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -448,6 +448,8 @@ memoize_protover_summary(protover_summary_flags_t *out, out->supports_v3_rendezvous_point = protocol_list_supports_protocol(protocols, PRT_HSREND, PROTOVER_HS_RENDEZVOUS_POINT_V3); + out->supports_padding = + protocol_list_supports_protocol(protocols, PRT_PADDING, 1); protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out)); cached = strmap_set(protover_summary_map, protocols, new_cached); diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index d94e73f48..15b3f7b60 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1106,7 +1106,7 @@ node_ed25519_id_matches(const node_t *node, const ed25519_public_key_t *id) /** Dummy object that should be unreturnable. Used to ensure that * node_get_protover_summary_flags() always returns non-NULL. */ static const protover_summary_flags_t zero_protover_flags = { - 0,0,0,0,0,0,0 + 0,0,0,0,0,0,0,0 }; /** Return the protover_summary_flags for a given node. */ diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 8624afeaf..0b2a78c21 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -46,6 +46,7 @@ pub enum Protocol { LinkAuth, Microdesc, Relay, + Padding, } impl fmt::Display for Protocol { @@ -73,6 +74,7 @@ impl FromStr for Protocol { "LinkAuth" => Ok(Protocol::LinkAuth), "Microdesc" => Ok(Protocol::Microdesc), "Relay" => Ok(Protocol::Relay), + "Padding" => Ok(Protocol::Padding), _ => Err(ProtoverError::UnknownProtocol), } } @@ -163,7 +165,8 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { Link=1-5 \ LinkAuth=3 \ Microdesc=1-2 \ - Relay=1-2" + Relay=1-2 \ + Padding=1" ) } else { cstr!( @@ -176,7 +179,8 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { Link=1-5 \ LinkAuth=1,3 \ Microdesc=1-2 \ - Relay=1-2" + Relay=1-2 \ + Padding=1" ) } }

1 0

[tor/master] Circuit padding header.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 2a24e21fb07ade157f1226039d71713c0c5b47b7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Oct 23 19:48:16 2018 +0000 Circuit padding header. This is a good code review start point, to get an overview of the interfaces and types used in circuit padding. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/core/or/circuitpadding.h | 685 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 685 insertions(+) diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h new file mode 100644 index 000000000..24034a454 --- /dev/null +++ b/src/core/or/circuitpadding.h @@ -0,0 +1,685 @@ +/* + * Copyright (c) 2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file circuitpadding.h + * \brief Header file for circuitpadding.c. + **/ +#ifndef TOR_CIRCUITPADDING_H +#define TOR_CIRCUITPADDING_H + +#include "circpad_negotiation.h" +#include "lib/evloop/timers.h" + +typedef struct circuit_t circuit_t; +typedef struct origin_circuit_t origin_circuit_t; +typedef struct cell_t cell_t; + +/** + * Signed error return with the specific property that negative + * values mean error codes of various semantics, 0 means success, + * and positive values are unused. + * + * XXX: Tor uses this concept a lot but just calls it int. Should we move + * this somewhere centralized? Where? + */ +typedef int signed_error_t; + +/** + * These constants specify the types of events that can cause + * transitions between state machine states. + * + * Note that SENT and RECV are relative to this endpoint. For + * relays, SENT means packets destined towards the client and + * RECV means packets destined towards the relay. On the client, + * SENT means packets destined towards the relay, where as RECV + * means packets destined towards the client. + */ +typedef enum { + /* A non-padding cell was received. */ + CIRCPAD_EVENT_NONPADDING_RECV = 0, + /* A non-padding cell was sent. */ + CIRCPAD_EVENT_NONPADDING_SENT = 1, + /* A padding cell (RELAY_COMMAND_DROP) was sent. */ + CIRCPAD_EVENT_PADDING_SENT = 2, + /* A padding cell was received. */ + CIRCPAD_EVENT_PADDING_RECV = 3, + /* We tried to schedule padding but we ended up picking the infinity bin + * which means that padding was delayed infinitely */ + CIRCPAD_EVENT_INFINITY = 4, + /* All histogram bins are empty (we are out of tokens) */ + CIRCPAD_EVENT_BINS_EMPTY = 5, + /* just a counter of the events above */ + CIRCPAD_EVENT_LENGTH_COUNT = 6 +} circpad_event_t; +#define CIRCPAD_NUM_EVENTS ((int)CIRCPAD_EVENT_LENGTH_COUNT+1) + +/** Boolean type that says if we decided to transition states or not */ +typedef enum { + CIRCPAD_STATE_UNCHANGED = 0, + CIRCPAD_STATE_CHANGED = 1 +} circpad_decision_t; + +/** The type for the things in histogram bins (aka tokens) */ +typedef uint32_t circpad_hist_token_t; + +/** The type for histogram indexes (needs to be negative for errors) */ +typedef int8_t circpad_hist_index_t; + +/** The type for absolute time, from monotime_absolute_usec() */ +typedef uint64_t circpad_time_t; + +/** The type for timer delays, in microseconds */ +typedef uint32_t circpad_delay_t; + +/** + * An infinite padding cell delay means don't schedule any padding -- + * simply wait until a different event triggers a transition. + * + * This means that the maximum delay we can scedule is UINT32_MAX-1 + * microseconds, or about 4300 seconds (1.25 hours). + * XXX: Is this enough if we want to simulate light, intermittent + * activity on an onion service? + */ +#define CIRCPAD_DELAY_INFINITE (UINT32_MAX) + +/** + * Macro to clarify when we're checking the infinity bin. + * + * Works with either circpad_state_t or circpad_machineinfo_t + */ +#define CIRCPAD_INFINITY_BIN(mi) ((mi)->histogram_len-1) + +/** + * These constants form a bitfield that specifies when a state machine + * should be applied to a circuit. + * + * If any of these elements is set, then the circuit will be tested against + * that specific condition. If an element is unset, then we don't test it. + * (E.g. If neither NO_STREAMS or STREAMS are set, then we will not care + * whether a circuit has streams attached when we apply a state machine) + * + * The helper function circpad_circuit_state() converts circuit state + * flags into this more compact representation. + */ +typedef enum { + /* Only apply machine if the circuit is still building */ + CIRCPAD_CIRC_BUILDING = 1<<0, + /* Only apply machine if the circuit is open */ + CIRCPAD_CIRC_OPENED = 1<<1, + /* Only apply machine if the circuit has no attached streams */ + CIRCPAD_CIRC_NO_STREAMS = 1<<2, + /* Only apply machine if the circuit has attached streams */ + CIRCPAD_CIRC_STREAMS = 1<<3, + /* Only apply machine if the circuit still allows RELAY_EARLY cells */ + CIRCPAD_CIRC_HAS_RELAY_EARLY = 1<<4, + /* Only apply machine if the circuit has depleted its RELAY_EARLY cells + * allowance. */ + CIRCPAD_CIRC_HAS_NO_RELAY_EARLY = 1<<5 +} circpad_circuit_state_t; + +/** Bitmask that says "apply this machine to all states" */ +#define CIRCPAD_STATE_ALL \ + (CIRCPAD_CIRC_BUILDING|CIRCPAD_CIRC_OPENED| \ + CIRCPAD_CIRC_STREAMS|CIRCPAD_CIRC_NO_STREAMS| \ + CIRCPAD_CIRC_HAS_RELAY_EARLY|CIRCPAD_CIRC_HAS_NO_RELAY_EARLY) + +/** + * A compact circuit purpose bitfield mask that allows us to compactly + * specify which circuit purposes a machine should apply to. + * + * The helper function circpad_circ_purpose_to_mask() converts circuit + * purposes into bit positions in this bitmask. + */ +typedef uint32_t circpad_purpose_mask_t; + +/** Bitmask that says "apply this machine to all purposes". */ +#define CIRCPAD_PURPOSE_ALL (0xFFFFFFFF) + +/** + * This type specifies all of the conditions that must be met before + * a client decides to initiate padding on a circuit. + * + * A circuit must satisfy every sub-field in this type in order + * to be considered to match the conditions. + */ +typedef struct circpad_machine_conditions_t { + /** Only apply the machine *if* the circuit has at least this many hops */ + unsigned min_hops : 3; + + /** Only apply the machine *if* vanguards are enabled */ + unsigned requires_vanguards : 1; + + /** Only apply the machine *if* the circuit's state matches any of + * the bits set in this bitmask. */ + circpad_circuit_state_t state_mask; + + /** Only apply a machine *if* the circuit's purpose matches one + * of the bits set in this bitmask */ + circpad_purpose_mask_t purpose_mask; + +} circpad_machine_conditions_t; + +/** + * Token removal strategy options. + * + * The WTF-PAD histograms are meant to specify a target distribution to shape + * traffic towards. This is accomplished by removing tokens from the histogram + * when either padding or non-padding cells are sent. + * + * When we see a non-padding cell at a particular time since the last cell, you + * remove a token from the corresponding delay bin. These flags specify + * which bin to choose if that bin is already empty. + */ +typedef enum { + /** Don't remove any tokens */ + CIRCPAD_TOKEN_REMOVAL_NONE = 0, + /** + * Remove from the first non-zero higher bin index when current is zero. + * This is the recommended strategy from the Adaptive Padding paper. */ + CIRCPAD_TOKEN_REMOVAL_HIGHER = 1, + /** Remove from the first non-zero lower bin index when current is empty. */ + CIRCPAD_TOKEN_REMOVAL_LOWER = 2, + /** Remove from the closest non-zero bin index when current is empty. */ + CIRCPAD_TOKEN_REMOVAL_CLOSEST = 3, + /** Remove from the closest bin by time value (since bins are + * exponentially spaced). */ + CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC = 4, + /** Only remove from the exact bin corresponding to this delay. If + * the bin is 0, simply do nothing. Don't pick another bin. */ + CIRCPAD_TOKEN_REMOVAL_EXACT = 5 +} circpad_removal_t; + +/** + * Distribution types supported by circpad_distribution_sample(). + * + * These can be used instead of histograms for the inter-packet + * timing distribution, or to specify a distribution on the number + * of cells that can be sent while in a specific state of the state + * machine. */ +typedef enum { + CIRCPAD_DIST_NONE = 0, + CIRCPAD_DIST_UNIFORM = 1, + CIRCPAD_DIST_LOGISTIC = 2, + CIRCPAD_DIST_LOG_LOGISTIC = 3, + CIRCPAD_DIST_GEOMETRIC = 4, + CIRCPAD_DIST_WEIBULL = 5, + CIRCPAD_DIST_PARETO = 6 +} circpad_distribution_type_t; + +/** + * Distribution information. + * + * This type specifies a specific distribution above, as well as + * up to two parameters for that distribution. The specific + * per-distribution meaning of these parameters is specified + * in circpad_distribution_sample(). + */ +typedef struct circpad_distribution_t { + circpad_distribution_type_t type; + double param1; + double param2; +} circpad_distribution_t; + +/** State number type. Represents current state of state machine. */ +typedef uint16_t circpad_statenum_t; +#define CIRCPAD_STATENUM_MAX (UINT16_MAX) + +/** A histogram is used to sample padding delays given a machine state. This + * constant defines the maximum histogram width (i.e. the max number of bins) + * + * Each histogram bin is twice as large as the previous. Two exceptions: The + * first bin has zero width (which means that minimum delay is applied to the + * next padding cell), and the last bin (infinity bin) has infinite width + * (which means that the next padding cell will be delayed infinitely). */ +#define CIRCPAD_MAX_HISTOGRAM_LEN (sizeof(circpad_delay_t)*8 + 1) + +/** + * A state of a padding machine. The information here are immutable and + * represent the initial form of the state; it does not get updated as things + * happen. The mutable information that gets updated in runtime are carried in + * a circpad_machineinfo_t. + * + * This struct describes the histograms and parameters of a single + * state in the adaptive padding machine. Instances of this struct + * exist in global circpad machine definitions that come from torrc + * or the consensus. + */ +typedef struct circpad_state_t { + /** If a histogram is used for this state, this specifies the number of bins + * of this histogram. Histograms must have at least 2 bins. + * + * If a delay probability distribution is used for this state, this is set + * to 0. */ + circpad_hist_index_t histogram_len; + /** The histogram itself: an array of uint16s of tokens, whose + * widths are exponentially spaced, in microseconds */ + circpad_hist_token_t histogram[CIRCPAD_MAX_HISTOGRAM_LEN]; + /** Total number of tokens in this histogram. This is a constant and is *not* + * decremented every time we spend a token. It's used for initializing and + * refilling the histogram. */ + uint32_t histogram_total_tokens; + + /** Minimum padding delay of this state in microseconds. + * + * If histograms are used, this is the left (and right) bound of the first + * bin (since it has zero width). + * + * If a delay probability distribution is used, this represents the minimum + * delay we can sample from the distribution. + */ + circpad_delay_t start_usec; + + /** If histograms are used, this is the width of the whole histogram in + * microseconds, and it's used to calculate individual bin width. + * + * If a delay probability distribution is used, this is used as the max + * delay we can sample from the distribution. + */ + circpad_delay_t range_usec; + + /** + * Represents a delay probability distribution (aka IAT distribution). It's a + * parametrized way of encoding inter-packet delay information in + * microseconds. It can be used instead of histograms. + * + * If it is used, token_removal below must be set to + * CIRCPAD_TOKEN_REMOVAL_NONE. + * + * Start_usec, range_sec, and rtt_estimates are still applied to the + * results of sampling from this distribution (range_sec is used as a max). + */ + circpad_distribution_t iat_dist; + + /** + * The length dist is a parameterized way of encoding how long this + * state machine runs in terms of sent padding cells or all + * sent cells. Values are sampled from this distribution, clamped + * to max_len, and then start_len is added to that value. + * + * It may be specified instead of or in addition to + * the infinity bins and bins empty conditions. */ + circpad_distribution_t length_dist; + /** A minimum length value, added to the output of length_dist */ + uint16_t start_length; + /** A cap on the length value that can be sampled from the length_dist */ + uint64_t max_length; + + /** Should we decrement length when we see a nonpadding packet? + * XXX: Are there any machines that actually want to set this to 0? There may + * not be. OTOH, it's only a bit.. */ + unsigned length_includes_nonpadding : 1; + + /** + * This is an array that specifies the next state to transition to upon + * receipt an event matching the indicated array index. + * + * This aborts our scheduled packet and switches to the state + * corresponding to the index of the array. Tokens are filled upon + * this transition. + * + * States are allowed to transition to themselves, which means re-schedule + * a new padding timer. They are also allowed to temporarily "transition" + * to the "IGNORE" and "CANCEL" pseudo-states. See #defines below + * for details on state behavior and meaning. + */ + circpad_statenum_t next_state[CIRCPAD_NUM_EVENTS]; + + /** + * If true, estimate the RTT from this relay to the exit/website and add that + * to start_usec for use as the histogram bin 0 start delay. + * + * Right now this is only supported for relay-side state machines. + */ + unsigned use_rtt_estimate : 1; + + /** This specifies the token removal strategy to use upon padding and + * non-padding activity. */ + circpad_removal_t token_removal; +} circpad_state_t; + +/** + * The start state for this machine. + * + * In the original WTF-PAD, this is only used for transition to/from + * the burst state. All other fields are not used. But to simplify the + * code we've made it a first-class state. This has no performance + * consequences, but may make naive serialization of the state machine + * large, if we're not careful about how we represent empty fields. + */ +#define CIRCPAD_STATE_START 0 + +/** + * The burst state for this machine. + * + * In the original Adaptive Padding algorithm and in WTF-PAD + * (https://www.freehaven.net/anonbib/cache/ShWa-Timing06.pdf and + * https://www.cs.kau.se/pulls/hot/thebasketcase-wtfpad/) the burst + * state serves to detect bursts in traffic. This is done by using longer + * delays in its histogram, which represent the expected delays between + * bursts of packets in the target stream. If this delay expires without a + * real packet being sent, the burst state sends a padding packet and then + * immediately transitions to the gap state, which is used to generate + * a synthetic padding packet train. In this implementation, this transition + * needs to be explicitly specified in the burst state's transition events. + * + * Because of this flexibility, other padding mechanisms can transition + * between these two states arbitrarily, to encode other dynamics of + * target traffic. + */ +#define CIRCPAD_STATE_BURST 1 + +/** + * The gap state for this machine. + * + * In the original Adaptive Padding algorithm and in WTF-PAD, the gap + * state serves to simulate an artificial packet train composed of padding + * packets. It does this by specifying much lower inter-packet delays than + * the burst state, and transitioning back to itself after padding is sent + * if these timers expire before real traffic is sent. If real traffic is + * sent, it transitions back to the burst state. + * + * Again, in this implementation, these transitions must be specified + * explicitly, and other transitions are also permitted. + */ +#define CIRCPAD_STATE_GAP 2 + +/** + * End is a pseudo-state that causes the machine to go completely + * idle, and optionally get torn down (depending on the + * value of circpad_machine_t.should_negotiate_end) + * + * End MUST NOT occupy a slot in the machine state array. + */ +#define CIRCPAD_STATE_END CIRCPAD_STATENUM_MAX + +/** + * "Ignore" is a pseudo-state that means "do not react to this + * event". + * + * "Ignore" MUST NOT occupy a slot in the machine state array. + */ +#define CIRCPAD_STATE_IGNORE (CIRCPAD_STATENUM_MAX-1) + +/** + * "Cancel" is a pseudo-state that means "cancel pending timers, + * but remain in your current state". + * + * Cancel MUST NOT occupy a slot in the machine state array. + */ +#define CIRCPAD_STATE_CANCEL (CIRCPAD_STATENUM_MAX-2) + +/** + * Since we have 3 pseudo-states, the max state array length is + * up to one less than cancel's statenum. + */ +#define CIRCPAD_MAX_MACHINE_STATES (CIRCPAD_STATE_CANCEL-1) + +/** + * Mutable padding machine info. + * + * This structure contains mutable information about a padding + * machine. The mutable information must be kept separate because + * it exists per-circuit, where as the machines themselves are global. + * This separation is done to conserve space in the circuit structure. + * + * This is the per-circuit state that changes regarding the global state + * machine. Some parts of it are optional (ie NULL). + * + * XXX: Play with layout to minimize space on x64 Linux (most common relay). + */ +typedef struct circpad_machineinfo_t { + /** The callback pointer for the padding callbacks. + * + * These timers stick around the machineinfo until the machineinfo's circuit + * is closed, at which point the timer is cancelled. For this reason it's + * safe to assume that the machineinfo exists if this timer gets + * triggered. */ + tor_timer_t *padding_timer; + + /** The circuit for this machine */ + circuit_t *on_circ; + + /** A mutable copy of the histogram for the current state. + * NULL if remove_tokens is false for that state */ + circpad_hist_token_t *histogram; + /** Length of the above histogram. + * XXX: This field *could* be removed at the expense of added + * complexity+overhead for reaching back into the immutable machine + * state every time we need to inspect the histogram. It's only a byte, + * though, so it seemed worth it. + */ + circpad_hist_index_t histogram_len; + /** Remove token from this index upon sending padding */ + circpad_hist_index_t chosen_bin; + + /** Stop padding/transition if this many cells sent */ + uint64_t state_length; +#define CIRCPAD_STATE_LENGTH_INFINITE UINT64_MAX + + /** A scaled count of padding packets sent, used to limit padding overhead. + * When this reaches UINT16_MAX, we cut it and nonpadding_sent in half. */ + uint16_t padding_sent; + /** A scaled count of non-padding packets sent, used to limit padding + * overhead. When this reaches UINT16_MAX, we cut it and padding_sent in + * half. */ + uint16_t nonpadding_sent; + + /** + * EWMA estimate of the RTT of the circuit from this hop + * to the exit end, in microseconds. */ + circpad_delay_t rtt_estimate_usec; + + /** + * The last time we got an event relevant to estimating + * the RTT. Monotonic time in microseconds since system + * start. + */ + circpad_time_t last_received_time_usec; + + /** + * The time at which we scheduled a non-padding packet, + * or selected an infinite delay. + * + * Monotonic time in microseconds since system start. + * This is 0 if we haven't chosen a padding delay. + */ + circpad_time_t padding_scheduled_at_usec; + + /** What state is this machine in? */ + circpad_statenum_t current_state; + + /** + * True if we have scheduled a timer for padding. + * + * This is 1 if a timer is pending. It is 0 if + * no timer is scheduled. (It can be 0 even when + * padding_was_scheduled_at_usec is non-zero). + */ + unsigned is_padding_timer_scheduled : 1; + + /** + * If this is true, we have seen full duplex behavior. + * Stop updating the RTT. + */ + unsigned stop_rtt_update : 1; + +/** Max number of padding machines on each circuit. If changed, + * also ensure the machine_index bitwith supports the new size. */ +#define CIRCPAD_MAX_MACHINES (2) + /** Which padding machine index was this for. + * (make sure changes to the bitwidth can support the + * CIRCPAD_MAX_MACHINES define). */ + unsigned machine_index : 1; + +} circpad_machineinfo_t; + +/** Helper macro to get an actual state machine from a machineinfo */ +#define CIRCPAD_GET_MACHINE(machineinfo) \ + ((machineinfo)->on_circ->padding_machine[(machineinfo)->machine_index]) + +/** + * This specifies a particular padding machine to use after negotiation. + * + * The constants for machine_num_t are in trunnel. + * We want to be able to define extra numbers in the consensus/torrc, though. + */ +typedef uint8_t circpad_machine_num_t; + +/** Global state machine structure from the consensus */ +typedef struct circpad_machine_t { + /** Global machine number */ + circpad_machine_num_t machine_num; + + /** Which machine index slot should this machine go into in + * the array on the circuit_t */ + unsigned machine_index : 1; + + /** Send a padding negotiate to shut down machine at end state? */ + unsigned should_negotiate_end : 1; + + // These next three fields are origin machine-only... + /** Origin side or relay side */ + unsigned is_origin_side : 1; + + /** Which hop in the circuit should we send padding to/from? + * 1-indexed (ie: hop #1 is guard, #2 middle, #3 exit). */ + unsigned target_hopnum : 3; + + /** This machine only kills fascists if the following conditions are met. */ + circpad_machine_conditions_t conditions; + + /** How many padding cells can be sent before we apply overhead limits? + * XXX: Note that we can only allow up to 64k of padding cells on an + * otherwise quiet circuit. Is this enough? It's 33MB. */ + uint16_t allowed_padding_count; + + /** Padding percent cap: Stop padding if we exceed this percent overhead. + * 0 means no limit. Overhead is defined as percent of total traffic, so + * that we can use 0..100 here. This is the same definition as used in + * Prop#265. */ + uint8_t max_padding_percent; + + /** State array: indexed by circpad_statenum_t */ + circpad_state_t *states; + + /** + * Number of states this machine has (ie: length of the states array). + * XXX: This field is not needed other than for safety. */ + circpad_statenum_t num_states; +} circpad_machine_t; + +void circpad_new_consensus_params(const networkstatus_t *ns); + +/** + * The following are event call-in points that are of interest to + * the state machines. They are called during cell processing. */ +void circpad_deliver_unrecognized_cell_events(circuit_t *circ, + cell_direction_t dir); +void circpad_deliver_sent_relay_cell_events(circuit_t *circ, + uint8_t relay_command); +void circpad_deliver_recognized_relay_cell_events(circuit_t *circ, + uint8_t relay_command, + crypt_path_t *layer_hint); + +/** Cell events are delivered by the above delivery functions */ +void circpad_cell_event_nonpadding_sent(circuit_t *on_circ); +void circpad_cell_event_nonpadding_received(circuit_t *on_circ); +void circpad_cell_event_padding_sent(circuit_t *on_circ); +void circpad_cell_event_padding_received(circuit_t *on_circ); + +/** Internal events are events the machines send to themselves */ +circpad_decision_t circpad_internal_event_infinity(circpad_machineinfo_t *mi); +circpad_decision_t circpad_internal_event_bins_empty(circpad_machineinfo_t *); +circpad_decision_t circpad_internal_event_state_length_up( + circpad_machineinfo_t *); + +/** Machine creation events are events that cause us to set up or + * tear down padding state machines. */ +void circpad_machine_event_circ_added_hop(origin_circuit_t *on_circ); +void circpad_machine_event_circ_built(origin_circuit_t *circ); +void circpad_machine_event_circ_purpose_changed(origin_circuit_t *circ); +void circpad_machine_event_circ_has_streams(origin_circuit_t *circ); +void circpad_machine_event_circ_has_no_streams(origin_circuit_t *circ); +void circpad_machine_event_circ_has_no_relay_early(origin_circuit_t *circ); + +void circpad_machines_init(void); +void circpad_machines_free(void); + +void circpad_machine_states_init(circpad_machine_t *machine, + circpad_statenum_t num_states); + +void circpad_circuit_free_all_machineinfos(circuit_t *circ); + +bool circpad_padding_is_from_expected_hop(circuit_t *circ, + crypt_path_t *from_hop); + +/** Serializaton functions for writing to/from torrc and consensus */ +char *circpad_machine_to_string(const circpad_machine_t *machine); +const circpad_machine_t *circpad_string_to_machine(const char *str); + +/* Padding negotiation between client and middle */ +signed_error_t circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell); +signed_error_t circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, + crypt_path_t *layer_hint); +signed_error_t circpad_negotiate_padding(origin_circuit_t *circ, + circpad_machine_num_t machine, + uint8_t target_hopnum, + uint8_t command); +bool circpad_padding_negotiated(circuit_t *circ, + circpad_machine_num_t machine, + uint8_t command, + uint8_t response); + +MOCK_DECL(circpad_decision_t, +circpad_machine_schedule_padding,(circpad_machineinfo_t *)); + +MOCK_DECL(circpad_decision_t, +circpad_machine_transition, (circpad_machineinfo_t *mi, + circpad_event_t event)); + +circpad_decision_t circpad_send_padding_cell_for_callback( + circpad_machineinfo_t *mi); + +#ifdef CIRCUITPADDING_PRIVATE +STATIC circpad_delay_t +circpad_machine_sample_delay(circpad_machineinfo_t *mi); + +STATIC bool +circpad_machine_reached_padding_limit(circpad_machineinfo_t *mi); + +STATIC +circpad_decision_t circpad_machine_remove_token(circpad_machineinfo_t *mi); + +STATIC circpad_delay_t +circpad_histogram_bin_to_usec(const circpad_machineinfo_t *mi, + circpad_hist_index_t bin); + +STATIC const circpad_state_t * +circpad_machine_current_state(const circpad_machineinfo_t *mi); + +STATIC circpad_hist_index_t circpad_histogram_usec_to_bin( + const circpad_machineinfo_t *mi, + circpad_delay_t us); + +STATIC circpad_machineinfo_t *circpad_circuit_machineinfo_new( + circuit_t *on_circ, + int machine_index); +STATIC void circpad_machine_remove_higher_token(circpad_machineinfo_t *mi, + circpad_delay_t target_bin_us); +STATIC void circpad_machine_remove_lower_token(circpad_machineinfo_t *mi, + circpad_delay_t target_bin_us); +STATIC void circpad_machine_remove_closest_token(circpad_machineinfo_t *mi, + circpad_delay_t target_bin_us, + bool use_usec); +STATIC void circpad_machine_setup_tokens(circpad_machineinfo_t *mi); + +#ifdef TOR_UNIT_TESTS +extern smartlist_t *origin_padding_machines; +extern smartlist_t *relay_padding_machines; +#endif + +#endif + +#endif

1 0

[tor/master] Hook up circuit padding to circuit_t.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit 2f7b5a2d4468532251dd7b177c02a9c192690174 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Oct 23 19:51:22 2018 +0000 Hook up circuit padding to circuit_t. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/core/or/circuit_st.h | 24 ++++++++++++++++++++++++ src/core/or/circuitlist.c | 4 ++++ src/core/or/origin_circuit_st.h | 4 ++++ 3 files changed, 32 insertions(+) diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h index 2e33b37b0..0d9ad3cdd 100644 --- a/src/core/or/circuit_st.h +++ b/src/core/or/circuit_st.h @@ -12,6 +12,11 @@ #include "core/or/cell_queue_st.h" struct hs_token_t; +typedef struct circpad_machine_t circpad_machine_t; +typedef struct circpad_machineinfo_t circpad_machineinfo_t; + +/** Number of padding state machines on a circuit. */ +#define CIRCPAD_MAX_MACHINES (2) /** "magic" value for an origin_circuit_t */ #define ORIGIN_CIRCUIT_MAGIC 0x35315243u @@ -177,6 +182,25 @@ struct circuit_t { /** Hashtable node: used to look up the circuit by its HS token using the HS circuitmap. */ HT_ENTRY(circuit_t) hs_circuitmap_node; + + /** Adaptive Padding state machines: these are immutable. The state machines + * that come from the consensus are saved to a global structure, to avoid + * per-circuit allocations. This merely points to the global copy. + * + * Each element of this array corresponds to a different padding machine, + * and we can have up to CIRCPAD_MAX_MACHINES such machines. */ + const circpad_machine_t *padding_machine[CIRCPAD_MAX_MACHINES]; + + /** Adaptive Padding machine info for above machines. This is the + * per-circuit mutable information, such as the current state and + * histogram token counts. Some of it is optional (aka NULL). + * If a machine is being shut down, these indexes can be NULL + * without the corresponding padding_machine being NULL, while we + * wait for the other end to respond to our shutdown request. + * + * Each element of this array corresponds to a different padding machine, + * and we can have up to CIRCPAD_MAX_MACHINES such machines. */ + circpad_machineinfo_t *padding_info[CIRCPAD_MAX_MACHINES]; }; #endif diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index c4b5f7ee3..71f8becdd 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -62,6 +62,7 @@ #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "core/or/circuitstats.h" +#include "core/or/circuitpadding.h" #include "core/mainloop/connection.h" #include "app/config/config.h" #include "core/or/connection_edge.h" @@ -1231,6 +1232,9 @@ circuit_free_(circuit_t *circ) CIRCUIT_IS_ORIGIN(circ) ? TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0); + /* Free any circuit padding structures */ + circpad_circuit_free_all_machineinfos(circ); + if (should_free) { memwipe(mem, 0xAA, memlen); /* poison memory */ tor_free(mem); diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index 26cdf590f..921076c1b 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -161,6 +161,10 @@ struct origin_circuit_t { * connections to this circuit. */ unsigned int unusable_for_new_conns : 1; + /* If this flag is set (due to padding negotiation failure), we should + * not try to negotiate further circuit padding. */ + unsigned padding_negotiation_failed : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision

1 0

[tor/master] Add relay crypto mock points for tests.
by nickm＠torproject.org 14 Jan '19

14 Jan '19

commit d62340018c8d363ea67ef01dc4a740e47fce2a10 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 23 20:31:16 2018 +0000 Add relay crypto mock points for tests. Co-authored-by: George Kadianakis <desnacked(a)riseup.net> --- src/core/or/relay.c | 6 +++--- src/core/or/relay.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 452777b2f..9c0f3bbbe 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -355,11 +355,11 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, * - Encrypt it to the right layer * - Append it to the appropriate cell_queue on <b>circ</b>. */ -static int -circuit_package_relay_cell(cell_t *cell, circuit_t *circ, +MOCK_IMPL(int, +circuit_package_relay_cell, (cell_t *cell, circuit_t *circ, cell_direction_t cell_direction, crypt_path_t *layer_hint, streamid_t on_stream, - const char *filename, int lineno) + const char *filename, int lineno)) { channel_t *chan; /* where to send the cell */ diff --git a/src/core/or/relay.h b/src/core/or/relay.h index db7f17b96..e84727e37 100644 --- a/src/core/or/relay.h +++ b/src/core/or/relay.h @@ -78,6 +78,11 @@ void destroy_cell_queue_append(destroy_cell_queue_t *queue, void channel_unlink_all_circuits(channel_t *chan, smartlist_t *detached_out); MOCK_DECL(int, channel_flush_from_first_active_circuit, (channel_t *chan, int max)); +MOCK_DECL(int, circuit_package_relay_cell, (cell_t *cell, circuit_t *circ, + cell_direction_t cell_direction, + crypt_path_t *layer_hint, streamid_t on_stream, + const char *filename, int lineno)); + void update_circuit_on_cmux_(circuit_t *circ, cell_direction_t direction, const char *file, int lineno); #define update_circuit_on_cmux(circ, direction) \

1 0