May 2021 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 05 May '21

05 May '21

commit 3e1c56ed9391eabcb5ca1bc127ab3136fadcb400 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 5 20:46:01 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- he.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/he.po b/he.po index 20007cb8e0..39191b654d 100644 --- a/he.po +++ b/he.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-27 13:32+0200\n" -"PO-Revision-Date: 2021-04-29 22:35+0000\n" +"PO-Revision-Date: 2021-05-05 20:44+0000\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -496,7 +496,7 @@ msgstr "_מצב לא מקוון" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:411 msgid "Enable networking (default)" -msgstr "" +msgstr "אפשר רישות (ברירת מחדל)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457 @@ -2279,7 +2279,7 @@ msgstr "מצב לא מקוון" msgid "" "If you want to work completely offline, you can disable all networking for " "increased security." -msgstr "" +msgstr "אם אתה רוצה לעבוד באופן לא מקוון לגמרי, אתה יכול להשבית את כל הרישות למען אבטחה מוגברת." #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526 msgid "" @@ -2480,7 +2480,7 @@ msgstr "תצר גשר של Tor" msgid "" "Bridges are secret Tor relays. Use a bridge as your first Tor relay if " "accessing Tor is blocked from where you are." -msgstr "" +msgstr "גשרים הם ממסרי Tor סודיים. השתמש בגשר כממסר Tor הראשון שלך אם גישה אל Tor חסומה מהמקום שאתה נמצא." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:98 msgid "Use a default bridge" @@ -2530,7 +2530,7 @@ msgstr "_היכנס אל הרשת" msgid "" "If you are on a corporate or university network, you might need to configure" " a proxy." -msgstr "" +msgstr "אם אתה על רשת של תאגיד או אוניברסיטה, ייתכן שתצרך לתצר ייפוח כוח." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:453 msgid "Configure a _Proxy" @@ -2562,7 +2562,7 @@ msgid "" "We recommend configuring Tor automatically if:\n" " - You are connecting from a public Wi-Fi network.\n" " - Connecting to Tor might be blocked in your country but using Tor is not criminalized." -msgstr "" +msgstr "<b>תצר את Tor באופן אוטומטי (קל יותר)</b>\n\nאנחנו ממליצים לתצר את Tor באופן אוטומטי אם:\n - אתה מתחבר מרשת Wi-Fi ציבורית.\n - התחברות אל Tor עשויה להיות חסומה במדינה שלך אבל שימוש ב־Tor אינו עבירה." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662 msgid "" @@ -2571,7 +2571,7 @@ msgid "" "You might need to go unnoticed if:\n" " - Using Tor might look suspicious to someone monitoring your home or work network.\n" " - Using Tor is criminalized in your country." -msgstr "" +msgstr "<b>הסתר אל הרשת המקומית שלי שאני משתמש ב־Tor (בטוח יותר)</b>\n\nייתכן שתצטרך להיות בלתי מגולה אם:\n - שימוש ב־Tor עשוי להיות חשוד למישהו שמנטר את הרשת הביתית שלך או רשת העבודה שלך.\n - שימוש ב־Tor הוא עבירה במדינה שלך." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:756 msgid "You lost connection to the local network." @@ -2602,7 +2602,7 @@ msgid "" "Connected to Tor successfully\n" "\n" "You can now browse the Internet anonymously and uncensored" -msgstr "" +msgstr "התחבר אל Tor בהצלחה\n\nאתה יכול עכשיו לעיין באינטרנט באופן אלמוני ובלתי מצונזר" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1014 msgid "Open Network Monitor"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 05 May '21

05 May '21

commit 0154121ce68c0c205fa14ba412336d801a96e11c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 5 17:16:34 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 6e1716773b..b7b172e980 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -24,7 +24,7 @@ # Cloud P <heige.pcloud(a)outlook.com>, 2019 # Runzhe Liang <18051080098(a)163.com>, 2020 # Sanya chang <408070986(a)qq.com>, 2013 -# Scott Rhodes <starring169(a)gmail.com>, 2020 +# Scott Rhodes <starring169(a)gmail.com>, 2020-2021 # Simon Koch <werfaultx(a)gmail.com>, 2020 # Siyuan Xu <mf20070535(a)126.com>, 2021 # khi, 2014 @@ -40,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-27 13:32+0200\n" -"PO-Revision-Date: 2021-05-02 12:55+0000\n" -"Last-Translator: ff98sha\n" +"PO-Revision-Date: 2021-05-05 16:56+0000\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 05 May '21

05 May '21

commit cc91072309c10b56b73f8214f44ff894f36302cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 5 17:15:50 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 6e1716773b..a050d8b780 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -24,7 +24,7 @@ # Cloud P <heige.pcloud(a)outlook.com>, 2019 # Runzhe Liang <18051080098(a)163.com>, 2020 # Sanya chang <408070986(a)qq.com>, 2013 -# Scott Rhodes <starring169(a)gmail.com>, 2020 +# Scott Rhodes <starring169(a)gmail.com>, 2020-2021 # Simon Koch <werfaultx(a)gmail.com>, 2020 # Siyuan Xu <mf20070535(a)126.com>, 2021 # khi, 2014 @@ -40,8 +40,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-27 13:32+0200\n" -"PO-Revision-Date: 2021-05-02 12:55+0000\n" -"Last-Translator: ff98sha\n" +"PO-Revision-Date: 2021-05-05 16:56+0000\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -497,7 +497,7 @@ msgstr "MAC 地址欺骗(_M)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250 msgid "_Offline Mode" -msgstr "" +msgstr "离线模式" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:411

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 05 May '21

05 May '21

commit 02d44993460bf7d1e14c6ff083952f7355e635ba Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 5 17:15:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 09e770f66b..a931ab7af1 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3,7 +3,6 @@ # ヨイツの賢狼ホロ, 2019 # 忻然李 <2544304894(a)qq.com>, 2020 # Kaia <szeming(a)riseup.net>, 2020 -# Scott Rhodes <starring169(a)gmail.com>, 2020 # Runzhe Liang <18051080098(a)163.com>, 2021 # YFdyh000 <yfdyh000(a)gmail.com>, 2021 # Gus, 2021 @@ -17,6 +16,7 @@ # Zhui Shen <12231252(a)bjtu.edu.cn>, 2021 # Emma Peel, 2021 # ff98sha, 2021 +# Scott Rhodes <starring169(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: ff98sha, 2021\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -410,7 +410,7 @@ msgstr "如何安装并配置每种中继服务器：网桥，守卫，中端， #: https//community.torproject.org/relay/setup/guard/ #: (content/relay-operations/technical-setup/guard/contents+en.lrpage.section) msgid "relay operations" -msgstr "" +msgstr "中继操作" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 05 May '21

05 May '21

commit efb046fe0acee712d483387051f0d87ba499197f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 5 12:48:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+hr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 8b263c7bb9..f2fb718c57 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -4,8 +4,8 @@ # Igor <lyricaltumor(a)gmail.com>, 2020 # Karlo Prikratki <karlo(a)karloprikratki.com>, 2020 # erinm, 2020 -# milotype <mail(a)milotype.de>, 2020 # Emma Peel, 2021 +# milotype <mail(a)milotype.de>, 2021 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: milotype <mail(a)milotype.de>, 2021\n" "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -520,7 +520,7 @@ msgid "" "intended you to get." msgstr "" "Šifrirani potpis dokazuje autentičnost poruke ili datoteke. Stvorio ga je " -"nositelj privatnog dijela šifriranja javnog ključa (../public-key-" +"nositelj privatnog dijela [šifriranja javnog ključa](../public-key-" "cryptography) i može se potvrditi odgovarajućim javnim ključem. Ako preuzmeš" " softver sa stranice torproject.org, naći ćeš ga kao datoteke potpisa " "(.asc). Ovo su PGP potpisi, kako bi mogao/la provjeriti, je li preuzeta " @@ -1883,8 +1883,8 @@ msgid "" "your browser configuration." msgstr "" "Dodatno, Tor preglednik je dizajniran da sprečava web mjesta koristiti " -"„digitalne otiske” ili da te se identificira na temelju konfiguracije tvog " -"preglednika." +"„[digitalne otiske](../browser-fingerprinting)” ili da te se identificira na" +" temelju konfiguracije tvog preglednika." #: https//support.torproject.org/glossary/tor-browser/ #: (content/glossary/tor-browser/contents+en.lrword.definition)

1 0

[tor-browser-build/master] Pick up fix for rbm#40024
by gk＠torproject.org 05 May '21

05 May '21

commit d6e9e4d906002979d6a0478cb8ee259e80d3996b Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 5 11:43:42 2021 +0000 Pick up fix for rbm#40024 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index ac75418..b7f534d 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ac7541882a965a14107b7b7016f341605f405267 +Subproject commit b7f534d6bdbaba7ee83fdf8d7068ec349470e8c7

1 0

[rbm/master] Bug 40024: Only create source tarball after getting all input_files
by gk＠torproject.org 05 May '21

05 May '21

commit b7f534d6bdbaba7ee83fdf8d7068ec349470e8c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 27 16:50:51 2021 +0200 Bug 40024: Only create source tarball after getting all input_files --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index d2aeab2..bc509cb 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1033,10 +1033,10 @@ sub build_run { . '/rbm-XXXXX'); my $srcdir = $tmpdir->dirname; my @cfiles; - my $tarfile = maketar($project, $options, $srcdir); - push @cfiles, $tarfile if $tarfile; push @cfiles, copy_files($project, $srcdir); push @cfiles, input_files('copy', $project, $options, $srcdir); + my $tarfile = maketar($project, $options, $srcdir); + push @cfiles, $tarfile if $tarfile; my ($remote_tmp_src, $remote_tmp_dst, %build_script); my @scripts = ('pre', $script_name, 'post'); my %scripts_root = ( pre => 1, post => 1);

1 0

[tor/maint-0.4.6] hs: Fix ADD_ONION with client authorization
by asn＠torproject.org 05 May '21

05 May '21

commit cf6e72b7020c47ba20677dc19602663723bd8491 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 4 10:37:26 2021 -0400 hs: Fix ADD_ONION with client authorization Turns out that passing client authorization keys to ADD_ONION for v3 was not working because we were not setting the "is_client_auth_enabled" flag to true once the clients were configured. This lead to the descriptor being encoded without the clients. This patch removes that flag and instead adds an inline function that can be used to check if a given service has client authorization enabled. This will be much less error prone of needing to keep in sync the client list and a flag instead. Fixes #40378 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40378 | 4 ++++ src/feature/hs/hs_service.c | 18 +++++++++++------- src/feature/hs/hs_service.h | 3 --- src/test/test_hs_service.c | 7 ------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/changes/ticket40378 b/changes/ticket40378 new file mode 100644 index 0000000000..35b2fd7bd4 --- /dev/null +++ b/changes/ticket40378 @@ -0,0 +1,4 @@ + o Major bugfixes (onion service, control port): + - Make the ADD_ONION command properly configure client authorization. Before + this fix, the created onion failed to add the client(s). Fixes bug 40378; + bugfix on 0.4.6.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index a232377221..9b7b590140 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -160,6 +160,15 @@ HT_GENERATE2(hs_service_ht, hs_service_t, hs_service_node, hs_service_ht_hash, hs_service_ht_eq, 0.6, tor_reallocarray, tor_free_); +/** Return true iff the given service has client authorization configured that + * is the client list is non empty. */ +static inline bool +is_client_auth_enabled(const hs_service_t *service) +{ + return (service->config.clients != NULL && + smartlist_len(service->config.clients) > 0); +} + /** Query the given service map with a public key and return a service object * if found else NULL. It is also possible to set a directory path in the * search query. If pk is NULL, then it will be set to zero indicating the @@ -1302,11 +1311,6 @@ load_client_keys(hs_service_t *service) } SMARTLIST_FOREACH_END(filename); - /* If the number of clients is greater than zero, set the flag to be true. */ - if (smartlist_len(config->clients) > 0) { - config->is_client_auth_enabled = 1; - } - /* Success. */ ret = 0; end: @@ -1816,7 +1820,7 @@ build_service_desc_superencrypted(const hs_service_t *service, /* We do not need to build the desc authorized client if the client * authorization is disabled */ - if (config->is_client_auth_enabled) { + if (is_client_auth_enabled(service)) { SMARTLIST_FOREACH_BEGIN(config->clients, hs_service_authorized_client_t *, client) { hs_desc_authorized_client_t *desc_client; @@ -3588,7 +3592,7 @@ service_encode_descriptor(const hs_service_t *service, /* If the client authorization is enabled, send the descriptor cookie to * hs_desc_encode_descriptor. Otherwise, send NULL */ - if (service->config.is_client_auth_enabled) { + if (is_client_auth_enabled(service)) { descriptor_cookie = desc->descriptor_cookie; } diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index f5be37b410..c48f470245 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -230,9 +230,6 @@ typedef struct hs_service_config_t { * HiddenServiceNumIntroductionPoints option. */ unsigned int num_intro_points; - /** True iff the client auth is enabled. */ - unsigned int is_client_auth_enabled : 1; - /** List of hs_service_authorized_client_t's of clients that may access this * service. Specified by HiddenServiceAuthorizeClient option. */ smartlist_t *clients; diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index e754eac108..33a3f279c6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -341,7 +341,6 @@ helper_create_service_with_clients(int num_clients) int i; hs_service_t *service = helper_create_service(); tt_assert(service); - service->config.is_client_auth_enabled = 1; service->config.clients = smartlist_new(); for (i = 0; i < num_clients; i++) { @@ -425,9 +424,6 @@ test_load_keys(void *arg) tt_int_op(hs_address_is_valid(addr), OP_EQ, 1); tt_str_op(addr, OP_EQ, s->onion_address); - /* Check that the is_client_auth_enabled is not set. */ - tt_assert(!s->config.is_client_auth_enabled); - done: tor_free(hsdir_v3); hs_free_all(); @@ -577,9 +573,6 @@ test_load_keys_with_client_auth(void *arg) tt_int_op(smartlist_len(service->config.clients), OP_EQ, smartlist_len(pubkey_b32_list)); - /* Test that the is_client_auth_enabled flag is set. */ - tt_assert(service->config.is_client_auth_enabled); - /* Test that the keys in clients are correct. */ SMARTLIST_FOREACH_BEGIN(pubkey_b32_list, char *, pubkey_b32) {

1 0

[tor/master] Merge branch 'maint-0.4.6'
by asn＠torproject.org 05 May '21

05 May '21

commit d6e7fc00f3c3f3d77b0f3257e7bb0d83e35b3e2a Merge: 1d18ecbc5f cf6e72b702 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 5 10:21:48 2021 +0300 Merge branch 'maint-0.4.6' changes/ticket40378 | 4 ++++ src/feature/hs/hs_service.c | 18 +++++++++++------- src/feature/hs/hs_service.h | 3 --- src/test/test_hs_service.c | 7 ------- 4 files changed, 15 insertions(+), 17 deletions(-)

1 0

[tor/master] hs: Fix ADD_ONION with client authorization
by asn＠torproject.org 05 May '21

05 May '21

commit cf6e72b7020c47ba20677dc19602663723bd8491 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 4 10:37:26 2021 -0400 hs: Fix ADD_ONION with client authorization Turns out that passing client authorization keys to ADD_ONION for v3 was not working because we were not setting the "is_client_auth_enabled" flag to true once the clients were configured. This lead to the descriptor being encoded without the clients. This patch removes that flag and instead adds an inline function that can be used to check if a given service has client authorization enabled. This will be much less error prone of needing to keep in sync the client list and a flag instead. Fixes #40378 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40378 | 4 ++++ src/feature/hs/hs_service.c | 18 +++++++++++------- src/feature/hs/hs_service.h | 3 --- src/test/test_hs_service.c | 7 ------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/changes/ticket40378 b/changes/ticket40378 new file mode 100644 index 0000000000..35b2fd7bd4 --- /dev/null +++ b/changes/ticket40378 @@ -0,0 +1,4 @@ + o Major bugfixes (onion service, control port): + - Make the ADD_ONION command properly configure client authorization. Before + this fix, the created onion failed to add the client(s). Fixes bug 40378; + bugfix on 0.4.6.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index a232377221..9b7b590140 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -160,6 +160,15 @@ HT_GENERATE2(hs_service_ht, hs_service_t, hs_service_node, hs_service_ht_hash, hs_service_ht_eq, 0.6, tor_reallocarray, tor_free_); +/** Return true iff the given service has client authorization configured that + * is the client list is non empty. */ +static inline bool +is_client_auth_enabled(const hs_service_t *service) +{ + return (service->config.clients != NULL && + smartlist_len(service->config.clients) > 0); +} + /** Query the given service map with a public key and return a service object * if found else NULL. It is also possible to set a directory path in the * search query. If pk is NULL, then it will be set to zero indicating the @@ -1302,11 +1311,6 @@ load_client_keys(hs_service_t *service) } SMARTLIST_FOREACH_END(filename); - /* If the number of clients is greater than zero, set the flag to be true. */ - if (smartlist_len(config->clients) > 0) { - config->is_client_auth_enabled = 1; - } - /* Success. */ ret = 0; end: @@ -1816,7 +1820,7 @@ build_service_desc_superencrypted(const hs_service_t *service, /* We do not need to build the desc authorized client if the client * authorization is disabled */ - if (config->is_client_auth_enabled) { + if (is_client_auth_enabled(service)) { SMARTLIST_FOREACH_BEGIN(config->clients, hs_service_authorized_client_t *, client) { hs_desc_authorized_client_t *desc_client; @@ -3588,7 +3592,7 @@ service_encode_descriptor(const hs_service_t *service, /* If the client authorization is enabled, send the descriptor cookie to * hs_desc_encode_descriptor. Otherwise, send NULL */ - if (service->config.is_client_auth_enabled) { + if (is_client_auth_enabled(service)) { descriptor_cookie = desc->descriptor_cookie; } diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index f5be37b410..c48f470245 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -230,9 +230,6 @@ typedef struct hs_service_config_t { * HiddenServiceNumIntroductionPoints option. */ unsigned int num_intro_points; - /** True iff the client auth is enabled. */ - unsigned int is_client_auth_enabled : 1; - /** List of hs_service_authorized_client_t's of clients that may access this * service. Specified by HiddenServiceAuthorizeClient option. */ smartlist_t *clients; diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index e754eac108..33a3f279c6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -341,7 +341,6 @@ helper_create_service_with_clients(int num_clients) int i; hs_service_t *service = helper_create_service(); tt_assert(service); - service->config.is_client_auth_enabled = 1; service->config.clients = smartlist_new(); for (i = 0; i < num_clients; i++) { @@ -425,9 +424,6 @@ test_load_keys(void *arg) tt_int_op(hs_address_is_valid(addr), OP_EQ, 1); tt_str_op(addr, OP_EQ, s->onion_address); - /* Check that the is_client_auth_enabled is not set. */ - tt_assert(!s->config.is_client_auth_enabled); - done: tor_free(hsdir_v3); hs_free_all(); @@ -577,9 +573,6 @@ test_load_keys_with_client_auth(void *arg) tt_int_op(smartlist_len(service->config.clients), OP_EQ, smartlist_len(pubkey_b32_list)); - /* Test that the is_client_auth_enabled flag is set. */ - tt_assert(service->config.is_client_auth_enabled); - /* Test that the keys in clients are correct. */ SMARTLIST_FOREACH_BEGIN(pubkey_b32_list, char *, pubkey_b32) {

1 0