- tor-commits - lists.torproject.org

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 09 Jan '16

09 Jan '16

commit 9f1c0af9ed48ec147bfd63dbc827cfb3cda6a536 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 9 03:17:20 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- ar/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/abouttbupdate.dtd b/ar/abouttbupdate.dtd index 2765faa..ce40b98 100644 --- a/ar/abouttbupdate.dtd +++ b/ar/abouttbupdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "تحديث متصفح تور"> <!ENTITY aboutTBUpdate.updated "لقد تم تحديث متصفح تور."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> +<!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 09 Jan '16

09 Jan '16

commit fc51a5f7bc043616220dd0712635b91b56ad144d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 9 02:47:16 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- ar/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/abouttbupdate.dtd b/ar/abouttbupdate.dtd index 37567bd..2765faa 100644 --- a/ar/abouttbupdate.dtd +++ b/ar/abouttbupdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.title "تحديث متصفح تور"> +<!ENTITY aboutTBUpdate.updated "لقد تم تحديث متصفح تور."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix ".">

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 09 Jan '16

09 Jan '16

commit f5f1172f3b21349709939c16d9aed1beb73e1a29 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 9 02:46:25 2016 +0000 Update translations for torbutton-abouttorproperties --- ar/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/abouttor.properties b/ar/abouttor.properties index 10f09a1..e16dc5b 100644 --- a/ar/abouttor.properties +++ b/ar/abouttor.properties @@ -25,7 +25,7 @@ aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to cont aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. +aboutTor.donationBanner.cd.quote=الخصوصية و التخفي تهمنا جميعا aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing aboutTor.donationBanner.rd.who=— Roger Dingledine

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 09 Jan '16

09 Jan '16

commit a85e3843c3d80b19a98bf548ae5632fdcce2fb66 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 9 02:45:54 2016 +0000 Update translations for abouttor-homepage --- ar/aboutTor.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index 4d3caae..a6d0e52 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "عن تور"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "هذا المتصفح خارج التحديث"> <!ENTITY aboutTor.outOfDateTorOff.label "أيضاً، هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDate2.label "اضغط على رمز البصلة ثم اختر "تحقق من تحديثات متصفح تور""> <!ENTITY aboutTor.check.label "اختبر إعدادات شبكة تور."> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "مرحبا بك في متصفح تور"> +<!ENTITY aboutTor.success2.label "تم الإتصال بشبكة تور"> <!ENTITY aboutTor.success3.label "يمكنك الآن تصفح الانترنت بشكل يحمي هويتك."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> @@ -49,4 +49,4 @@ <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> <!ENTITY aboutTor.donate.donate "تبرع"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> +<!ENTITY aboutTor.donate.supportTor "فضلا إدعم تور!">

1 0

[tor/master] Merge branch 'unixninja_ticket15989_squashed'
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 95f5910810de88725c86a854db1c1653ec19f724 Merge: 5b5abd8 4f0e289 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 8 15:52:22 2016 -0800 Merge branch 'unixninja_ticket15989_squashed' changes/ticket15989 | 9 +++++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 6 +++++- src/or/hibernate.c | 20 ++++++++++++++++++-- src/or/hibernate.h | 1 + src/or/or.h | 6 ++++-- src/or/router.c | 7 +++++-- src/or/status.c | 22 ++++++++++++++++++---- src/test/test_accounting.c | 26 ++++++++++++++++++++++++++ src/test/test_status.c | 7 ++++--- 10 files changed, 94 insertions(+), 16 deletions(-)

1 0

[tor/master] Give 18024 a bug number.
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 8fc27ac0420c71205c61edb1c8e02ffce516a906 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 8 15:55:49 2016 -0800 Give 18024 a bug number. --- changes/ticket15989 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket15989 b/changes/ticket15989 index 1fd1fbb..e90d0cf 100644 --- a/changes/ticket15989 +++ b/changes/ticket15989 @@ -5,5 +5,5 @@ o Minor bugfixe (accounting): - The max bandwidth when using AccountRule sum - is now correctly logged. + is now correctly logged. Fixes bug 18024; bugfix on 0.2.6.1-alpha. Patch from "unixninja92".

1 0

[tor/master] Added AccountRule in and AccountingRule out options
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 4f0e28977d6376ccba599e7089aeb9e3b4f25e5f Author: unixninja92 <charles(a)unixninja92.com> Date: Sun Jan 3 23:02:44 2016 -0500 Added AccountRule in and AccountingRule out options --- changes/ticket15989 | 9 +++++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 6 +++++- src/or/hibernate.c | 20 ++++++++++++++++++-- src/or/hibernate.h | 1 + src/or/or.h | 6 ++++-- src/or/router.c | 7 +++++-- src/or/status.c | 22 ++++++++++++++++++---- src/test/test_accounting.c | 26 ++++++++++++++++++++++++++ src/test/test_status.c | 7 ++++--- 10 files changed, 94 insertions(+), 16 deletions(-) diff --git a/changes/ticket15989 b/changes/ticket15989 new file mode 100644 index 0000000..1fd1fbb --- /dev/null +++ b/changes/ticket15989 @@ -0,0 +1,9 @@ + o Minor enhancement (accounting): + - Added two modes to AccountingRule in torrc for + limiting just input or just output. + Closes ticket 15989; patch from "unixninja92". + + o Minor bugfixe (accounting): + - The max bandwidth when using AccountRule sum + is now correctly logged. + Patch from "unixninja92". diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3514c4d..0fea831 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1773,12 +1773,14 @@ is non-zero): of the time, which is more useful than a set of slow servers that are always "available". -[[AccountingRule]] **AccountingRule** **sum**|**max**:: +[[AccountingRule]] **AccountingRule** **sum**|**max**|**in**|**out**:: How we determine when our AccountingMax has been reached (when we should hibernate) during a time interval. Set to "max" to calculate using the higher of either the sent or received bytes (this is the default functionality). Set to "sum" to calculate using the sent - plus received bytes. (Default: max) + plus received bytes. Set to "in" to calculate using only the + received bytes. Set to "out" to calculate using only the sent bytes. + (Default: max) [[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__:: Specify how long accounting periods last. If **month** is given, each diff --git a/src/or/config.c b/src/or/config.c index a1f8e49..3ea1e1f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3454,8 +3454,12 @@ options_validate(or_options_t *old_options, or_options_t *options, options->AccountingRule = ACCT_SUM; else if (!strcmp(options->AccountingRule_option, "max")) options->AccountingRule = ACCT_MAX; + else if (!strcmp(options->AccountingRule_option, "in")) + options->AccountingRule = ACCT_IN; + else if (!strcmp(options->AccountingRule_option, "out")) + options->AccountingRule = ACCT_OUT; else - REJECT("AccountingRule must be 'sum' or 'max'"); + REJECT("AccountingRule must be 'sum', 'max', 'in', or 'out'"); } if (options->DirPort_set && !options->DirCache) { diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 5f727e2..7f8530b 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -412,11 +412,15 @@ configure_accounting(time_t now) /** Return the relevant number of bytes sent/received this interval * based on the set AccountingRule */ -static uint64_t +uint64_t get_accounting_bytes(void) { if (get_options()->AccountingRule == ACCT_SUM) return n_bytes_read_in_interval+n_bytes_written_in_interval; + else if (get_options()->AccountingRule == ACCT_IN) + return n_bytes_read_in_interval; + else if (get_options()->AccountingRule == ACCT_OUT) + return n_bytes_written_in_interval; else return MAX(n_bytes_read_in_interval, n_bytes_written_in_interval); } @@ -1010,7 +1014,7 @@ getinfo_helper_accounting(control_connection_t *conn, else *answer = tor_strdup("awake"); } else if (!strcmp(question, "accounting/bytes")) { - tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, + tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, U64_PRINTF_ARG(n_bytes_read_in_interval), U64_PRINTF_ARG(n_bytes_written_in_interval)); } else if (!strcmp(question, "accounting/bytes-left")) { @@ -1022,6 +1026,18 @@ getinfo_helper_accounting(control_connection_t *conn, total_left = limit - total_bytes; tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, U64_PRINTF_ARG(total_left), U64_PRINTF_ARG(total_left)); + } else if (get_options()->AccountingRule == ACCT_IN) { + uint64_t read_left = 0; + if (n_bytes_read_in_interval < limit) + read_left = limit - n_bytes_read_in_interval; + tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, + U64_PRINTF_ARG(read_left), U64_PRINTF_ARG(limit)); + } else if (get_options()->AccountingRule == ACCT_OUT) { + uint64_t write_left = 0; + if (n_bytes_written_in_interval < limit) + write_left = limit - n_bytes_written_in_interval; + tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, + U64_PRINTF_ARG(limit), U64_PRINTF_ARG(write_left)); } else { uint64_t read_left = 0, write_left = 0; if (n_bytes_read_in_interval < limit) diff --git a/src/or/hibernate.h b/src/or/hibernate.h index b9e619c..e0d0c29 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -19,6 +19,7 @@ MOCK_DECL(int, accounting_is_enabled, (const or_options_t *options)); int accounting_get_interval_length(void); MOCK_DECL(time_t, accounting_get_end_time, (void)); void configure_accounting(time_t now); +uint64_t get_accounting_bytes(void); void accounting_run_housekeeping(time_t now); void accounting_add_bytes(size_t n_read, size_t n_written, int seconds); int accounting_record_bandwidth_usage(time_t now, or_state_t *state); diff --git a/src/or/or.h b/src/or/or.h index 89c5398..3178fda 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3893,9 +3893,11 @@ typedef struct { * hibernate." */ /** How do we determine when our AccountingMax has been reached? * "max" for when in or out reaches AccountingMax - * "sum" for when in plus out reaches AccountingMax */ + * "sum" for when in plus out reaches AccountingMax + * "in" for when in reaches AccountingMax + * "out" for when out reaches AccountingMax */ char *AccountingRule_option; - enum { ACCT_MAX, ACCT_SUM } AccountingRule; + enum { ACCT_MAX, ACCT_SUM, ACCT_IN, ACCT_OUT } AccountingRule; /** Base64-encoded hash of accepted passwords for the control system. */ config_line_t *HashedControlPassword; diff --git a/src/or/router.c b/src/or/router.c index 2081bdb..c94dca9 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1133,10 +1133,13 @@ router_should_be_directory_server(const or_options_t *options, int dir_port) int new_choice=1; const char *reason = NULL; - if (accounting_is_enabled(options)) { + if (accounting_is_enabled(options) && + get_options()->AccountingRule != ACCT_IN) { /* Don't spend bytes for directory traffic if we could end up hibernating, * but allow DirPort otherwise. Some people set AccountingMax because - * they're confused or to get statistics. */ + * they're confused or to get statistics. Directory traffic has a much + * larger effect on output than input so there is no reason to turn it + * off if using AccountingRule in. */ int interval_length = accounting_get_interval_length(); uint32_t effective_bw = get_effective_bwrate(options); uint64_t acc_bytes; diff --git a/src/or/status.c b/src/or/status.c index 8f7be0a..69d1072 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -164,24 +164,38 @@ log_accounting(const time_t now, const or_options_t *options) or_state_t *state = get_or_state(); char *acc_rcvd = bytes_to_usage(state->AccountingBytesReadInInterval); char *acc_sent = bytes_to_usage(state->AccountingBytesWrittenInInterval); + char *acc_used = bytes_to_usage(get_accounting_bytes()); uint64_t acc_bytes = options->AccountingMax; char *acc_max; time_t interval_end = accounting_get_end_time(); char end_buf[ISO_TIME_LEN + 1]; char *remaining = NULL; - if (options->AccountingRule == ACCT_SUM) - acc_bytes *= 2; acc_max = bytes_to_usage(acc_bytes); format_local_iso_time(end_buf, interval_end); remaining = secs_to_uptime(interval_end - now); + const char *acc_rule; + switch (options->AccountingRule) { + case ACCT_MAX: acc_rule = "max"; + break; + case ACCT_SUM: acc_rule = "sum"; + break; + case ACCT_OUT: acc_rule = "out"; + break; + case ACCT_IN: acc_rule = "in"; + break; + default: acc_rule = "max"; + break; + } + log_notice(LD_HEARTBEAT, "Heartbeat: Accounting enabled. " - "Sent: %s / %s, Received: %s / %s. The " + "Sent: %s, Received: %s, Used: %s / %s, Rule: %s. The " "current accounting interval ends on %s, in %s.", - acc_sent, acc_max, acc_rcvd, acc_max, end_buf, remaining); + acc_sent, acc_rcvd, acc_used, acc_max, acc_rule, end_buf, remaining); tor_free(acc_rcvd); tor_free(acc_sent); + tor_free(acc_used); tor_free(acc_max); tor_free(remaining); } diff --git a/src/test/test_accounting.c b/src/test/test_accounting.c index 25908e9..7edba98 100644 --- a/src/test/test_accounting.c +++ b/src/test/test_accounting.c @@ -61,6 +61,32 @@ test_accounting_limits(void *arg) fake_time += 1; consider_hibernation(fake_time); tor_assert(we_are_hibernating() == 1); + + options->AccountingRule = ACCT_OUT; + + accounting_add_bytes(100, 10, 1); + fake_time += 1; + consider_hibernation(fake_time); + tor_assert(we_are_hibernating() == 0); + + accounting_add_bytes(0, 90, 1); + fake_time += 1; + consider_hibernation(fake_time); + tor_assert(we_are_hibernating() == 1); + + options->AccountingMax = 300; + options->AccountingRule = ACCT_IN; + + accounting_add_bytes(10, 100, 1); + fake_time += 1; + consider_hibernation(fake_time); + tor_assert(we_are_hibernating() == 0); + + accounting_add_bytes(90, 0, 1); + fake_time += 1; + consider_hibernation(fake_time); + tor_assert(we_are_hibernating() == 1); + goto done; done: NS_UNMOCK(get_or_state); diff --git a/src/test/test_status.c b/src/test/test_status.c index cbc8af1..57d69b1 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -707,12 +707,13 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_ptr_op(strstr(funcname, "log_accounting"), OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, - "Heartbeat: Accounting enabled. Sent: %s / %s, Received: %s / %s. " - "The current accounting interval ends on %s, in %s."); + "Heartbeat: Accounting enabled. Sent: %s, Received: %s, Used: %s / " + "%s, Rule: %s. The current accounting interval ends on %s, in %s."); tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_sent */ - tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_max */ tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_rcvd */ + tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_used */ tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_max */ + tt_str_op(va_arg(ap, char *), OP_EQ, "max"); /* acc_rule */ /* format_local_iso_time uses local tz, just check mins and secs. */ tt_ptr_op(strstr(va_arg(ap, char *), ":01:00"), OP_NE, NULL); /* end_buf */

1 0

[tor/master] Use get_interface6_via_udp_socket_hack() properly in _list().
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 110765f5564a588c5f019d32b5e6f66cc7806c41 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Jan 6 14:47:35 2016 +0100 Use get_interface6_via_udp_socket_hack() properly in _list(). When _list() is called with AF_UNSPEC family and fails to enumerate network interfaces using platform specific API, have it call _hack() twice to find out IPv4 and/or IPv6 address of a machine Tor instance is running on. This is correct way to handle this case because _hack() can only be called with AF_INET and AF_INET6 and does not support any other address family. --- changes/feature17951 | 6 ++++++ src/common/address.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/changes/feature17951 b/changes/feature17951 new file mode 100644 index 0000000..42ec32a --- /dev/null +++ b/changes/feature17951 @@ -0,0 +1,6 @@ + o Minor features: + - When get_interface_address6_list(.,AF_UNSPEC,.) is called and fails + to enumerate interface addresses using the platform-specific API, + have it rely on the UDP socket fallback technique to try and find + out what IP addresses (both IPv4 and IPv6) our machine has. Resolves + ticket 17951. diff --git a/src/common/address.c b/src/common/address.c index 69a8098..e2d0eac 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1547,8 +1547,9 @@ tor_addr_is_multicast(const tor_addr_t *a) } /** Attempt to retrieve IP address of current host by utilizing some - * UDP socket trickery. Only look for address of given family. - * Set result to *addr. Return 0 on success, -1 on failure. + * UDP socket trickery. Only look for address of given family + * (only AF_INET and AF_INET6 are supported). Set result to *addr. + * Return 0 on success, -1 on failure. */ MOCK_IMPL(int, get_interface_address6_via_udp_socket_hack,(int severity, @@ -1720,15 +1721,27 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, } /* Okay, the smart way is out. */ - if (get_interface_address6_via_udp_socket_hack(severity,family,&addr)) - return smartlist_new(); - if (!include_internal && tor_addr_is_internal(&addr, 0)) { - return smartlist_new(); - } else { - addrs = smartlist_new(); - smartlist_add(addrs, tor_dup_addr(&addr)); - return addrs; + addrs = smartlist_new(); + + if (family == AF_INET || family == AF_UNSPEC) { + if (get_interface_address6_via_udp_socket_hack(severity,AF_INET, + &addr) == 0) { + if (include_internal || !tor_addr_is_internal(&addr, 0)) { + smartlist_add(addrs, tor_dup_addr(&addr)); + } + } } + + if (family == AF_INET6 || family == AF_UNSPEC) { + if (get_interface_address6_via_udp_socket_hack(severity,AF_INET6, + &addr) == 0) { + if (include_internal || !tor_addr_is_internal(&addr, 0)) { + smartlist_add(addrs, tor_dup_addr(&addr)); + } + } + } + + return addrs; } /* ======

1 0

[tor/master] Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41'
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 5b5abd8c038b88cba7078a105b0896cd151ee509 Merge: a1019b8 110765f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 8 15:08:28 2016 -0800 Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41' changes/feature17951 | 6 ++++++ src/common/address.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-)

1 0

[tor/master] Always test both ed25519 backends.
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit b18f533cf06188607d444daa50974a6fc836f82d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 23 09:16:26 2015 -0500 Always test both ed25519 backends. Part of #16794 --- changes/bug16794_ed | 3 +++ src/common/crypto_ed25519.c | 22 ++++++++++++++++++++++ src/common/crypto_ed25519.h | 5 +++++ src/test/test_crypto.c | 42 ++++++++++++++++++++++++++++++++++-------- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/changes/bug16794_ed b/changes/bug16794_ed new file mode 100644 index 0000000..a43c401 --- /dev/null +++ b/changes/bug16794_ed @@ -0,0 +1,3 @@ + o Testing: + - Always test both ed25519 backends, so that we can be sure that + our batch-open replacement code works. Part of ticket 16794. diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 41ec486..9df665f 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -96,6 +96,28 @@ get_ed_impl(void) return ed25519_impl; } +#ifdef TOR_UNIT_TESTS +static const ed25519_impl_t *saved_ed25519_impl = NULL; +void +crypto_ed25519_testing_force_impl(const char *name) +{ + tor_assert(saved_ed25519_impl == NULL); + saved_ed25519_impl = ed25519_impl; + if (! strcmp(name, "donna")) { + ed25519_impl = &impl_donna; + } else { + tor_assert(!strcmp(name, "ref10")); + ed25519_impl = &impl_ref10; + } +} +void +crypto_ed25519_testing_restore_impl(void) +{ + ed25519_impl = saved_ed25519_impl; + saved_ed25519_impl = NULL; +} +#endif + /** * Initialize a new ed25519 secret key in seckey_out. If * extra_strong, take the RNG inputs directly from the operating diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h index bdac12e..4fa7ea1 100644 --- a/src/common/crypto_ed25519.h +++ b/src/common/crypto_ed25519.h @@ -111,5 +111,10 @@ int ed25519_pubkey_eq(const ed25519_public_key_t *key1, void ed25519_set_impl_params(int use_donna); void ed25519_init(void); +#ifdef TOR_UNIT_TESTS +void crypto_ed25519_testing_force_impl(const char *name); +void crypto_ed25519_testing_restore_impl(void); +#endif + #endif diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index e343779..b57aaf6 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1688,6 +1688,25 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); } +static void * +ed25519_testcase_setup(const struct testcase_t *testcase) +{ + crypto_ed25519_testing_force_impl(testcase->setup_data); + return testcase->setup_data; +} +static int +ed25519_testcase_cleanup(const struct testcase_t *testcase, void *ptr) +{ + (void)testcase; + (void)ptr; + crypto_ed25519_testing_restore_impl(); + return 1; +} +static const struct testcase_setup_t ed25519_test_setup = { + ed25519_testcase_setup, ed25519_testcase_cleanup +}; + + static void test_crypto_ed25519_simple(void *arg) { @@ -2327,6 +2346,14 @@ test_crypto_failure_modes(void *arg) #define CRYPTO_LEGACY(name) \ { #name, test_crypto_ ## name , 0, NULL, NULL } +#define ED25519_TEST_ONE(name, fl, which) \ + { #name "/ed25519_" which, test_crypto_ed25519_ ## name, (fl), \ + &ed25519_test_setup, (void*)which } + +#define ED25519_TEST(name, fl) \ + ED25519_TEST_ONE(name, (fl), "donna"), \ + ED25519_TEST_ONE(name, (fl), "ref10") + struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), CRYPTO_LEGACY(rng), @@ -2355,14 +2382,13 @@ struct testcase_t crypto_tests[] = { { "curve25519_wrappers", test_crypto_curve25519_wrappers, 0, NULL, NULL }, { "curve25519_encode", test_crypto_curve25519_encode, 0, NULL, NULL }, { "curve25519_persist", test_crypto_curve25519_persist, 0, NULL, NULL }, - { "ed25519_simple", test_crypto_ed25519_simple, 0, NULL, NULL }, - { "ed25519_test_vectors", test_crypto_ed25519_test_vectors, 0, NULL, NULL }, - { "ed25519_encode", test_crypto_ed25519_encode, 0, NULL, NULL }, - { "ed25519_convert", test_crypto_ed25519_convert, 0, NULL, NULL }, - { "ed25519_blinding", test_crypto_ed25519_blinding, 0, NULL, NULL }, - { "ed25519_testvectors", test_crypto_ed25519_testvectors, 0, NULL, NULL }, - { "ed25519_fuzz_donna", test_crypto_ed25519_fuzz_donna, TT_FORK, NULL, - NULL }, + ED25519_TEST(simple, 0), + ED25519_TEST(test_vectors, 0), + ED25519_TEST(encode, 0), + ED25519_TEST(convert, 0), + ED25519_TEST(blinding, 0), + ED25519_TEST(testvectors, 0), + ED25519_TEST(fuzz_donna, TT_FORK), { "siphash", test_crypto_siphash, 0, NULL, NULL }, { "failure_modes", test_crypto_failure_modes, TT_FORK, NULL, NULL }, END_OF_TESTCASES

1 0