June 2018 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit b73d9ba74999b2f723c98d28e4c488b90faf7653 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 13:15:31 2018 +0000 Update translations for https_everywhere --- eu/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/ssl-observatory.dtd b/eu/ssl-observatory.dtd index 94d80dd64..30187b330 100644 --- a/eu/ssl-observatory.dtd +++ b/eu/ssl-observatory.dtd @@ -87,7 +87,7 @@ Xehetasun gehiagorako pasa ezazu sagua aukeren gainetik:"> <!ENTITY ssl-observatory.warning.title "EFFren SSL Behatokiaren ABISUA"> <!ENTITY ssl-observatory.warning.showcert "Ziurtagiri katea erakutsi"> <!ENTITY ssl-observatory.warning.okay "Ulertzen dut"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> +<!ENTITY ssl-observatory.warning.text "EFFren SSL Behatokiak leku honen HTTPS ziurtagiri(ar)entzako abisua igorri du:"> <!ENTITY ssl-observatory.warning.defense "Webgune honetan saioa hasi baduzu, komeni litzateke konexio seguru bat duzunean pasahitza aldatzea. (Abisu hauek HTTPS Everywhereren "SSL Behatokia" hobespenen fitxan ezgaitu daitezke.)"> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit 07a96b93e63288d04ec198ec6ecd914228bf90a8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:19:39 2018 +0000 Update translations for support-tbb --- vi.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi.json b/vi.json index e4ba34fc5..2660835a2 100644 --- a/vi.json +++ b/vi.json @@ -38,7 +38,7 @@ "tbb-7": { "id": "#tbb-7", "control": "tbb-7", - "title": "My favorite website is blocking access over Tor.", + "title": "Trang web yêu thích của tôi bị chặn truy cập thông qua Tor.", "description": "Sorry to hear that you can't visit the website you wanted! Sometimes websites will block Tor users because they can't tell the difference between the average Tor user and automated traffic. The best success we've had in getting sites to unblock Tor users is getting users to contact the site administrators directly. Something like this might do the trick: \"Hi! I tried to access your site xyz.com while using Tor Browser and discovered that you don't allow Tor users to access your site. I urge you to reconsider this decision; Tor is used by people all over the world to protect their privacy and fight censorship. By blocking Tor users, you are likely blocking people in repressive countries who want to use a free internet, journalists and researchers who want to protect themselves from discovery, whistleblowers, activists, and ordinary people who want to opt out of invasive third party tracking. Please take a strong stance in favor of digital priv acy and internet freedom, and allow Tor users access to xyz.com. Thank you.\" In the case of banks, and other sensitive websites, it is also common to see geography-based blocking (if a bank knows you generally access their services from one country, and suddenly you are connecting from an exit relay on the other side of the world, your account may be locked or suspended). If you are unable to connect to an onion service, please see <a href=\"#onionservices-3\">I cannot reach X.onion!</a>" }, "tbb-7-1": { @@ -50,7 +50,7 @@ "tbb-8": { "id": "#tbb-8", "control": "tbb-8", - "title": "Our website is blocked by a censor. Can Tor Browser help users access our website?", + "title": "Website của chúng tôi đã bị chặn. Tor Browser có thể giúp người dùng truy cập trang web?", "description": "Tor Browser can certainly help people access your website in places where it is blocked. Most of the time, simply downloading the <a href=\"https://www.torproject.org/download/download-easy.html.en\">Tor Browser</a> and then using it to navigate to the blocked site will allow access. In places where there is heavy censorship we have a number of censorship circumvention options available, including <a href=\"https://www.torproject.org/docs/pluggable-transports.html.en\">pluggable transports</a>. For more information, please see the <a href=\"https://tb-manual.torproject.org/en-US/\">Tor Browser User Manual</a> section on <a href=\"https://tb-manual.torproject.org/en-US/circumvention.html\">censorship</a>." }, "tbb-9": { @@ -116,7 +116,7 @@ "tbb-19": { "id": "#tbb-19", "control": "tbb-19", - "title": "I can’t connect to Tor Browser, is my network censored?", + "title": "Tôi không thể kết nối tới Tor Browser, có phải mạng của tôi đã bị kiểm duyệt?", "description": "You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our <a href=\"https://bridges.torproject.org/\">Bridges website</a>. For more information about bridges, see the <a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a>." }, "tbb-20": {

1 0

[translation/support-gettor] Update translations for support-gettor
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit 8617538562486e0b57374b2833e274f0446163ac Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:19:17 2018 +0000 Update translations for support-gettor --- vi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi.json b/vi.json index 1f4c42c72..fdc676c2e 100644 --- a/vi.json +++ b/vi.json @@ -2,7 +2,7 @@ "gettor-1": { "id": "#gettor-1", "control": "gettor-1", - "title": "How do I download Tor if the torproject.org is blocked?", + "title": "Tôi có thể download tor khi torproject.org bị chặn như thế nào?", "description": "If you can't download Tor through our <a href=\"https://www.torproject.org\">website</a>, you can get a copy of Tor delivered to you via GetTor. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations that are less likely to be censored, such as Dropbox, Google Drive, and Github." }, "gettor-2": {

1 0

[translation/support-faq] Update translations for support-faq
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit e405e0a600694bb8bcb3e080e719ad3a59934207 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:19:09 2018 +0000 Update translations for support-faq --- vi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi.json b/vi.json index a4a631779..cd6c952e8 100644 --- a/vi.json +++ b/vi.json @@ -8,7 +8,7 @@ "faq-2": { "id": "#faq-2", "control": "faq-2", - "title": "Our website is blocked by a censor. Can Tor Browser help users access our website?", + "title": "Website của chúng tôi đã bị chặn. Tor Browser có thể giúp người dùng truy cập trang web?", "description": "Tor Browser can certainly help people access your website in places where it is blocked. Most of the time, simply downloading the Tor Browser and then using it to navigate to the blocked site will allow access. In places where there is heavy censorship, we have a number of censorship circumvention options available, including pluggable transports. For more information, please see the Tor Browser User Manual section on censorship." }, "faq-3": {

1 0

[translation/support-censorship] Update translations for support-censorship
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit d280c68ddd0291c51d282396736dacd219bb0155 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:18:54 2018 +0000 Update translations for support-censorship --- vi.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vi.json b/vi.json index 9abeb2f10..78d093230 100644 --- a/vi.json +++ b/vi.json @@ -2,25 +2,25 @@ "censorship-1": { "id": "#censorship-1", "control": "censorship-1", - "title": "Our website is blocked by a censor. Can Tor Browser help users access our website?", + "title": "Website của chúng tôi đã bị chặn. Tor Browser có thể giúp người dùng truy cập trang web?", "description": "Tor Browser can certainly help people access your website in places where it is blocked. Most of the time, simply downloading the <a href=\"https://www.torproject.org/download/download-easy.html.en\">Tor Browser</a> and then using it to navigate to the blocked site will allow access. In places where there is heavy censorship we have a number of censorship circumvention options available, including <a href=\"https://www.torproject.org/docs/pluggable-transports.html.en\">pluggable transports</a>. For more information, please see the <a href=\"https://tb-manual.torproject.org/en-US/\">Tor Browser User Manual</a> section on <a href=\"https://tb-manual.torproject.org/en-US/circumvention.html\">censorship</a>." }, "censorship-2": { "id": "#censorship-2", "control": "censorship-2", - "title": "My favorite website is blocking access over Tor.", + "title": "Trang web yêu thích của tôi bị chặn truy cập thông qua Tor.", "description": "Sorry to hear that you can't visit the website you wanted! Sometimes websites will block Tor users because they can't tell the difference between the average Tor user and automated traffic. The best success we've had in getting sites to unblock Tor users is getting users to contact the site administrators directly. Something like this might do the trick: \"Hi! I tried to access your site xyz.com while using Tor Browser and discovered that you don't allow Tor users to access your site. I urge you to reconsider this decision; Tor is used by people all over the world to protect their privacy and fight censorship. By blocking Tor users, you are likely blocking people in repressive countries who want to use a free internet, journalists and researchers who want to protect themselves from discovery, whistleblowers, activists, and ordinary people who want to opt out of invasive third party tracking. Please take a strong stance in favor of digital priv acy and internet freedom, and allow Tor users access to xyz.com. Thank you.\" In the case of banks, and other sensitive websites, it is also common to see geography-based blocking (if a bank knows you generally access their services from one country, and suddenly you are connecting from an exit relay on the other side of the world, your account may be locked or suspended). If you are unable to connect to an onion service, please see <a href=\"#onionservices-3\">I cannot reach X.onion!</a>" }, "censorship-3": { "id": "#censorship-3", "control": "censorship-3", - "title": "How do I download Tor if the torproject.org is blocked?", + "title": "Tôi có thể download tor khi torproject.org bị chặn như thế nào?", "description": "If you can't download Tor through our <a href=\"https://www.torproject.org\">website</a>, you can get a copy of Tor delivered to you via GetTor. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations that are less likely to be censored, such as Dropbox, Google Drive, and Github." }, "censorship-4": { "id": "#censorship-4", "control": "censorship-4", - "title": "I can’t connect to Tor Browser, is my network censored?", + "title": "Tôi không thể kết nối tới Tor Browser, có phải mạng của tôi đã bị kiểm duyệt?", "description": "You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our <a href=\"https://bridges.torproject.org/\">Bridges website</a>. For more information about bridges, see the <a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a>." }, "censorship-5": { @@ -32,7 +32,7 @@ "censorship-6": { "id": "#censorship-6", "control": "censorship-6", - "title": "I can’t connect to Tor Browser, is my network censored?", + "title": "Tôi không thể kết nối tới Tor Browser, có phải mạng của tôi đã bị kiểm duyệt?", "description": "You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our <a href=\"https://bridges.torproject.org/\">Bridges website</a>. For more information about bridges, see the <a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a>." }

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit eaec1f625434e17049ee8424d4df0b4b4d0f04bb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:18:02 2018 +0000 Update translations for torbutton-abouttorproperties --- vi/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/abouttor.properties b/vi/abouttor.properties index 5542fac9e..56a00af10 100644 --- a/vi/abouttor.properties +++ b/vi/abouttor.properties @@ -17,4 +17,4 @@ aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide aboutTor.donationBanner.tagline3=Freedom Online aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Bảo vệ riêng tư của hàng triệu người mỗi ngày

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Jun '18

28 Jun '18

commit 5468d3d902824e6033c308eebf6d90ed4c82b1df Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 28 12:15:30 2018 +0000 Update translations for https_everywhere --- vi/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/https-everywhere.dtd b/vi/https-everywhere.dtd index df7a0d1bb..3f8cbce8e 100644 --- a/vi/https-everywhere.dtd +++ b/vi/https-everywhere.dtd @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.options.importSettings "Nhập những cài đặt"> <!ENTITY https-everywhere.options.import "Nhập"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> -<!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Hiện tab devtools"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> <!ENTITY https-everywhere.options.imported "Những cài đặt của bạn đã được nhập">

1 0

[stem/master] Support vote's new bandwidth-file fields
by atagar＠torproject.org 27 Jun '18

27 Jun '18

commit 450390e0ce57680d0ae37853b26bec4e90e26d6b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 27 15:57:37 2018 -0700 Support vote's new bandwidth-file fields Support for a newly added network status vote field... https://gitweb.torproject.org/torspec.git/commit/?id=84591df While whipping this up it crossed my mind that the spec is uncommonly loose for this one. Some examples of odd valid content are... * Empty lines: 'bandwidth-file' * Multiple equals: 'bandwidth-file timestamp=12=34' * Inclusion of these lines in the consensus. Pointed these out to juga. Also, imho 'headers' should be in the name somewhere since that's what these are (not a path or file content itself). --- docs/change_log.rst | 1 + stem/descriptor/networkstatus.py | 30 ++++++++++++++++++++++- test/unit/descriptor/networkstatus/document_v3.py | 26 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index e735d6b2..eeaf0362 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -66,6 +66,7 @@ The following are only available within Stem's `git repository * `Fallback directory v2 support <https://lists.torproject.org/pipermail/tor-dev/2017-December/012721.html>`_, which adds *nickname* and *extrainfo* * Added the *orport_v6* attribute to the :class:`~stem.directory.Authority` class * Added server descriptor's new is_hidden_service_dir attribute + * Added the network status vote's new bandwidth_file attribute (:spec:`84591df`) * Don't retry downloading descriptors when we've timed out * Don't download from tor26 and Bifroest, which are authorities that frequently timeout * `stem.descriptor.remote <api/descriptor/remote.html>`_ now consistently defaults **fall_back_to_authority** to false diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 1be802f5..0e1af80b 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -130,6 +130,7 @@ HEADER_STATUS_DOCUMENT_FIELDS = ( ('shared-rand-commit', True, False, False), ('shared-rand-previous-value', True, True, False), ('shared-rand-current-value', True, True, False), + ('bandwidth-file', True, False, False), ('recommended-client-protocols', True, True, False), ('recommended-relay-protocols', True, True, False), ('required-client-protocols', True, True, False), @@ -783,6 +784,27 @@ def _parse_shared_rand_current_value(descriptor, entries): raise ValueError("A network status document's 'shared-rand-current-value' line must be a pair of values, the first an integer but was '%s'" % value) +def _parse_bandwidth_file(descriptor, entries): + # "bandwidth-file" KeyValues + # Value ::= any printing ASCII character except NL and SP. + # KeyValue ::= Keyword '=' Value + # KeyValues ::= KeyValue | KeyValues SP KeyValue + + value = _value('bandwidth-file', entries) + results = {} + + for entry in value.split(' '): + if not entry: + continue + elif '=' not in entry: + raise ValueError("'bandwidth-file' lines must be a series of 'key=value' pairs: %s" % value) + + k, v = entry.split('=', 1) + results[k] = v + + descriptor.bandwidth_file = results + + _parse_header_valid_after_line = _parse_timestamp_line('valid-after', 'valid_after') _parse_header_fresh_until_line = _parse_timestamp_line('fresh-until', 'fresh_until') _parse_header_valid_until_line = _parse_timestamp_line('valid-until', 'valid_until') @@ -852,6 +874,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var dict recommended_relay_protocols: recommended protocols for relays :var dict required_client_protocols: required protocols for clients :var dict required_relay_protocols: required protocols for relays + :var dict bandwidth_file: bandwidth authority headers that generated this vote **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined @@ -868,7 +891,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): .. versionchanged:: 1.6.0 Added the recommended_client_protocols, recommended_relay_protocols, - required_client_protocols, and required_relay_protocols. + required_client_protocols, and required_relay_protocols attributes. .. versionchanged:: 1.6.0 The is_shared_randomness_participate and shared_randomness_commitments @@ -880,6 +903,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): shared_randomness_previous_reveal_count attributes were undocumented and not provided properly if retrieved before their shred_randomness_*_value counterpart. + + .. versionchanged:: 1.7.0 + Added the bandwidth_file attributbute. """ ATTRIBUTES = { @@ -910,6 +936,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared_randomness_previous_value': (None, _parse_shared_rand_previous_value), 'shared_randomness_current_reveal_count': (None, _parse_shared_rand_current_value), 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), + 'bandwidth_file': ({}, _parse_bandwidth_file), 'signatures': ([], _parse_footer_directory_signature_line), 'bandwidth_weights': ({}, _parse_footer_bandwidth_weights_line), @@ -937,6 +964,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'params': _parse_header_parameters_line, 'shared-rand-previous-value': _parse_shared_rand_previous_value, 'shared-rand-current-value': _parse_shared_rand_current_value, + 'bandwidth-file': _parse_bandwidth_file, } FOOTER_PARSER_FOR_LINE = { diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 20b38563..6b11fe6c 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -1255,6 +1255,32 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(None, authority.shared_randomness_current_reveal_count) self.assertEqual(None, authority.shared_randomness_current_value) + def test_bandwidth_file(self): + """ + Parses a 'bandwidth-file' line of votes. + """ + + test_values = { + '': {}, + 'timestamp=': {'timestamp': ''}, + 'timestamp=12=34': {'timestamp': '12=34'}, + 'timestamp=123': {'timestamp': '123'}, + 'timestamp=123 version=1.0': {'timestamp': '123', 'version': '1.0'}, + 'timestamp=123 version=1.0 software=neat_thingy': {'timestamp': '123', 'version': '1.0', 'software': 'neat_thingy'}, + } + + for test_value, expected_value in test_values.items(): + document = NetworkStatusDocumentV3.create({'vote-status': 'vote', 'bandwidth-file': test_value}) + self.assertEqual(expected_value, document.bandwidth_file) + + # there really isn't much that *isn't* valid :P + + content = NetworkStatusDocumentV3.content({'vote-status': 'vote', 'bandwidth-file': 'key_without_value'}) + self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) + + document = NetworkStatusDocumentV3(content, False) + self.assertEqual(DEFAULT_PARAMS, document.params) + def test_with_legacy_directory_authorities(self): """ Includes both normal authorities and those following the '-legacy' format.

1 0

[tor/master] rectify include paths (automatic) for confline.h
by nickm＠torproject.org 27 Jun '18

27 Jun '18

commit 0b7452eeb2f2dee7acefee2d3ca2cb402a877ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 16:54:57 2018 -0400 rectify include paths (automatic) for confline.h --- src/common/conffile.c | 2 +- src/common/storagedir.c | 2 +- src/or/or.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/conffile.c b/src/common/conffile.c index bfb78c35c..d3215a22e 100644 --- a/src/common/conffile.c +++ b/src/common/conffile.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ #include "common/compat.h" -#include "common/confline.h" +#include "lib/encoding/confline.h" #include "common/conffile.h" #include "lib/log/torlog.h" #include "common/util.h" diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 0e0618d51..53b785bcf 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -3,7 +3,7 @@ #include "lib/container/smartlist.h" #include "common/compat.h" -#include "common/confline.h" +#include "lib/encoding/confline.h" #include "common/memarea.h" #include "lib/sandbox/sandbox.h" #include "common/storagedir.h" diff --git a/src/or/or.h b/src/or/or.h index df0e60c26..ebafc607f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -75,7 +75,7 @@ #include "lib/net/address.h" #include "common/compat_libevent.h" #include "ht.h" -#include "common/confline.h" +#include "lib/encoding/confline.h" #include "or/replaycache.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h"

1 0

[tor/master] Move set/get_uint*() to inline functions in arch/bytes.h
by nickm＠torproject.org 27 Jun '18

27 Jun '18

commit 4d81f5211b3c714edae6370bccc6873033c0092d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 15:00:11 2018 -0400 Move set/get_uint*() to inline functions in arch/bytes.h Also move our ntohll/htonll functions. --- src/common/compat.c | 65 -------------------- src/common/compat.h | 17 +----- src/common/util.c | 21 ------- src/common/util.h | 3 - src/include.am | 1 + src/lib/arch/.may_include | 2 + src/lib/arch/bytes.h | 148 ++++++++++++++++++++++++++++++++++++++++++++++ src/lib/arch/include.am | 3 + 8 files changed, 155 insertions(+), 105 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index e26591776..033ffa6ae 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -227,71 +227,6 @@ tor_strtok_r_impl(char *str, const char *sep, char **lasts) return start; } -/** - * Read a 16-bit value beginning at cp. Equivalent to - * *(uint16_t*)(cp), but will not cause segfaults on platforms that forbid - * unaligned memory access. - */ -uint16_t -get_uint16(const void *cp) -{ - uint16_t v; - memcpy(&v,cp,2); - return v; -} -/** - * Read a 32-bit value beginning at cp. Equivalent to - * *(uint32_t*)(cp), but will not cause segfaults on platforms that forbid - * unaligned memory access. - */ -uint32_t -get_uint32(const void *cp) -{ - uint32_t v; - memcpy(&v,cp,4); - return v; -} -/** - * Read a 64-bit value beginning at cp. Equivalent to - * *(uint64_t*)(cp), but will not cause segfaults on platforms that forbid - * unaligned memory access. - */ -uint64_t -get_uint64(const void *cp) -{ - uint64_t v; - memcpy(&v,cp,8); - return v; -} - -/** - * Set a 16-bit value beginning at cp to v. Equivalent to - * *(uint16_t*)(cp) = v, but will not cause segfaults on platforms that forbid - * unaligned memory access. */ -void -set_uint16(void *cp, uint16_t v) -{ - memcpy(cp,&v,2); -} -/** - * Set a 32-bit value beginning at cp to v. Equivalent to - * *(uint32_t*)(cp) = v, but will not cause segfaults on platforms that forbid - * unaligned memory access. */ -void -set_uint32(void *cp, uint32_t v) -{ - memcpy(cp,&v,4); -} -/** - * Set a 64-bit value beginning at cp to v. Equivalent to - * *(uint64_t*)(cp) = v, but will not cause segfaults on platforms that forbid - * unaligned memory access. */ -void -set_uint64(void *cp, uint64_t v) -{ - memcpy(cp,&v,8); -} - /** Represents a lockfile on which we hold the lock. */ struct tor_lockfile_t { /** Name of the file */ diff --git a/src/common/compat.h b/src/common/compat.h index 1379f95a7..2282e07be 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -46,6 +46,7 @@ #endif #include "lib/cc/compat_compiler.h" +#include "lib/arch/bytes.h" #include "common/compat_time.h" #include "lib/string/compat_ctype.h" #include "lib/string/compat_string.h" @@ -152,22 +153,6 @@ typedef enum { /* ===== OS compatibility */ MOCK_DECL(const char *, get_uname, (void)); -uint16_t get_uint16(const void *cp) ATTR_NONNULL((1)); -uint32_t get_uint32(const void *cp) ATTR_NONNULL((1)); -uint64_t get_uint64(const void *cp) ATTR_NONNULL((1)); -void set_uint16(void *cp, uint16_t v) ATTR_NONNULL((1)); -void set_uint32(void *cp, uint32_t v) ATTR_NONNULL((1)); -void set_uint64(void *cp, uint64_t v) ATTR_NONNULL((1)); - -/* These uint8 variants are defined to make the code more uniform. */ -#define get_uint8(cp) (*(const uint8_t*)(cp)) -static void set_uint8(void *cp, uint8_t v); -static inline void -set_uint8(void *cp, uint8_t v) -{ - *(uint8_t*)cp = v; -} - #if !defined(HAVE_RLIM_T) typedef unsigned long rlim_t; #endif diff --git a/src/common/util.c b/src/common/util.c index 6233b8e4f..09d3b2679 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2848,24 +2848,3 @@ ENABLE_GCC_WARNING(double-promotion) ENABLE_GCC_WARNING(float-conversion) #endif } - -/** Return a uint64_t value from a in network byte order. */ -uint64_t -tor_htonll(uint64_t a) -{ -#ifdef WORDS_BIGENDIAN - /* Big endian. */ - return a; -#else /* WORDS_BIGENDIAN */ - /* Little endian. The worst... */ - return htonl((uint32_t)(a>>32)) | - (((uint64_t)htonl((uint32_t)a))<<32); -#endif /* defined(WORDS_BIGENDIAN) */ -} - -/** Return a uint64_t value from a in host byte order. */ -uint64_t -tor_ntohll(uint64_t a) -{ - return tor_htonll(a); -} diff --git a/src/common/util.h b/src/common/util.h index 4f8d6395d..2b16fc457 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -39,9 +39,6 @@ #include "lib/fs/files.h" #include "lib/fs/path.h" -uint64_t tor_htonll(uint64_t a); -uint64_t tor_ntohll(uint64_t a); - void tor_log_mallinfo(int severity); /** Macro: yield a pointer to an enclosing structure given a pointer to diff --git a/src/include.am b/src/include.am index e5527b098..62234d468 100644 --- a/src/include.am +++ b/src/include.am @@ -1,4 +1,5 @@ include src/ext/include.am +include src/lib/arch/include.am include src/lib/err/include.am include src/lib/cc/include.am include src/lib/ctime/include.am diff --git a/src/lib/arch/.may_include b/src/lib/arch/.may_include new file mode 100644 index 000000000..4285c3dcb --- /dev/null +++ b/src/lib/arch/.may_include @@ -0,0 +1,2 @@ +orconfig.h +lib/cc/*.h diff --git a/src/lib/arch/bytes.h b/src/lib/arch/bytes.h new file mode 100644 index 000000000..dcd35ae4f --- /dev/null +++ b/src/lib/arch/bytes.h @@ -0,0 +1,148 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_BYTES_H +#define TOR_BYTES_H + +#include <stdlib.h> +#include "lib/cc/torint.h" + +/* The uint8 variants are defined to make the code more uniform. */ +static inline uint8_t +get_uint8(const void *cp) +{ + return *(const uint8_t*)(cp); +} +static inline void +set_uint8(void *cp, uint8_t v) +{ + *(uint8_t*)cp = v; +} + +/** + * Read a 16-bit value beginning at cp. Equivalent to + * *(uint16_t*)(cp), but will not cause segfaults on platforms that forbid + * unaligned memory access. + */ +static inline uint16_t +get_uint16(const void *cp) +{ + uint16_t v; + memcpy(&v,cp,2); + return v; +} +/** + * Read a 32-bit value beginning at cp. Equivalent to + * *(uint32_t*)(cp), but will not cause segfaults on platforms that forbid + * unaligned memory access. + */ +static inline uint32_t +get_uint32(const void *cp) +{ + uint32_t v; + memcpy(&v,cp,4); + return v; +} +/** + * Read a 64-bit value beginning at cp. Equivalent to + * *(uint64_t*)(cp), but will not cause segfaults on platforms that forbid + * unaligned memory access. + */ +static inline uint64_t +get_uint64(const void *cp) +{ + uint64_t v; + memcpy(&v,cp,8); + return v; +} + +/** + * Set a 16-bit value beginning at cp to v. Equivalent to + * *(uint16_t*)(cp) = v, but will not cause segfaults on platforms that forbid + * unaligned memory access. */ +static inline void +set_uint16(void *cp, uint16_t v) +{ + memcpy(cp,&v,2); +} +/** + * Set a 32-bit value beginning at cp to v. Equivalent to + * *(uint32_t*)(cp) = v, but will not cause segfaults on platforms that forbid + * unaligned memory access. */ +static inline void +set_uint32(void *cp, uint32_t v) +{ + memcpy(cp,&v,4); +} +/** + * Set a 64-bit value beginning at cp to v. Equivalent to + * *(uint64_t*)(cp) = v, but will not cause segfaults on platforms that forbid + * unaligned memory access. */ +static inline void +set_uint64(void *cp, uint64_t v) +{ + memcpy(cp,&v,8); +} + +#ifdef WORDS_BIGENDIAN +static inline uint32_t +tor_htonl(uint32_t a) +{ + return a; +} + +static inline uint32_t +tor_ntohl(uint64_t a) +{ + return a; +} + +static inline uint64_t +tor_htonll(uint64_t a) +{ + return a; +} + +static inline uint64_t +tor_ntohll(uint64_t a) +{ + return a; +} +#else +static inline uint32_t +tor_htonl(uint32_t a) +{ + /* Our compilers will indeed recognize this as bswap. */ + return + ((a & 0x000000ff) <<24) | + ((a & 0x0000ff00) << 8) | + ((a & 0x00ff0000) >> 8) | + ((a & 0xff000000) >>24); +} + +static inline uint32_t +tor_ntohl(uint32_t a) +{ + return tor_htonl(a); +} + +/** Return a uint64_t value from a in network byte order. */ +static inline uint64_t +tor_htonll(uint64_t a) +{ + /* Little endian. The worst... */ + return tor_htonl((uint32_t)(a>>32)) | + (((uint64_t)tor_htonl((uint32_t)a))<<32); +} + +/** Return a uint64_t value from a in host byte order. */ +static inline uint64_t +tor_ntohll(uint64_t a) +{ + return tor_htonll(a); +} +#endif + +#endif diff --git a/src/lib/arch/include.am b/src/lib/arch/include.am new file mode 100644 index 000000000..f92ee9222 --- /dev/null +++ b/src/lib/arch/include.am @@ -0,0 +1,3 @@ + +noinst_HEADERS += \ + src/lib/arch/bytes.h

1 0