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

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 09 May '18

09 May '18

commit abde29824ceb76bd21e728260796ecb4ff55151a Merge: a639a6784 394f102ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 09 May '18

09 May '18

commit ff46d08fd4f1fd6a93fd878e1b4b18f610b53132 Merge: 582f78454 abde29824 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
by nickm＠torproject.org 09 May '18

09 May '18

commit 394f102ea6b0494cde97769a99d75e91b5743616 Merge: be5b4415c 7e8c5e366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:15 2018 -0400 Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[metrics-web/master] Fix TB downloads by locale and Relays by flag graphs.
by karsten＠torproject.org 09 May '18

09 May '18

commit 4cb0fd677271a1faa3a7f99e5e7868d5cf50a7a8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 15:13:55 2018 +0200 Fix TB downloads by locale and Relays by flag graphs. --- src/main/R/rserver/graphs.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index b6eb221..79d5600 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -580,8 +580,8 @@ plot_relayflags <- function(start, end, flags, path) { write_relayflags <- function(start, end, flags, path) { prepare_relayflags(start, end, flags) %>% - mutate(variable = tolower(variable)) %>% - spread(variable, value) %>% + mutate(flag = tolower(flag)) %>% + spread(flag, relays) %>% write.csv(path, quote = FALSE, row.names = FALSE) } @@ -1269,7 +1269,7 @@ write_webstats_tb_platform <- function(start, end, path) { plot_webstats_tb_locale <- function(start, end, path) { d <- read.csv(paste(stats_dir, "webstats.csv", sep = ""), - colClasses = c("log_date" = "Date")) + colClasses = c("log_date" = "Date", "locale" = "character")) d <- d[d$log_date >= start & d$log_date <= end & d$request_type == "tbid", ] e <- d e <- aggregate(list(count = e$count), by = list(locale = e$locale), FUN = sum) @@ -1300,7 +1300,7 @@ plot_webstats_tb_locale <- function(start, end, path) { # breaks and labels. Left as future work. write_webstats_tb_locale <- function(start, end, path) { d <- read.csv(paste(stats_dir, "webstats.csv", sep = ""), - colClasses = c("log_date" = "Date")) + colClasses = c("log_date" = "Date", "locale" = "character")) d <- d[d$log_date >= start & d$log_date <= end & d$request_type == "tbid", ] e <- d e <- aggregate(list(count = e$count), by = list(locale = e$locale), FUN = sum)

1 0

[translation/support-topics_completed] Update translations for support-topics_completed
by translation＠torproject.org 09 May '18

09 May '18

commit 119e60a90fc04faa0239fdb17c3bc299e77b4422 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 12:49:50 2018 +0000 Update translations for support-topics_completed --- zh_CN.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_CN.json b/zh_CN.json index f9afa7cf2..7f0018aa4 100644 --- a/zh_CN.json +++ b/zh_CN.json @@ -5,18 +5,18 @@ "label": "常见问题" }, "tbb": { - "path": "#tor浏览器", - "control": "tor浏览器", + "path": "#tbb", + "control": "tbb", "label": "tor浏览器" }, "tormessenger": { - "path": "#tor-messenger", - "control": "tor-messenger", + "path": "#tormessenger", + "control": "tormessenger", "label": "Tor Messenger" }, "tormobile": { - "path": "#tor-mobile", - "control": "tor-mobile", + "path": "#tormobile", + "control": "tormobile", "label": "Tor Mobile" }, "gettor": { @@ -25,8 +25,8 @@ "label": "GetTor" }, "connecting": { - "path": "#连接tor", - "control": "连接tor", + "path": "#连接到tor", + "control": "连接到tor", "label": "连接Tor" }, "censorship": {

1 0

[translation/support-topics] Update translations for support-topics
by translation＠torproject.org 09 May '18

09 May '18

commit e833ff7ce896a6e1db051d122b804c5e20dfa00e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 12:49:45 2018 +0000 Update translations for support-topics --- zh_CN.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN.json b/zh_CN.json index 4043509d8..7f0018aa4 100644 --- a/zh_CN.json +++ b/zh_CN.json @@ -25,8 +25,8 @@ "label": "GetTor" }, "connecting": { - "path": "#connectingtotor", - "control": "connectingtotor", + "path": "#连接到tor", + "control": "连接到tor", "label": "连接Tor" }, "censorship": { @@ -45,8 +45,8 @@ "label": "选项" }, "onionservices": { - "path": "#onionservices", - "control": "onionservices", + "path": "#洋葱服务", + "control": "洋葱服务", "label": "洋葱服务" }, "misc": {

1 0

[tor/maint-0.3.3] Merge branch 'libressl_201805_029' into maint-0.3.3
by nickm＠torproject.org 09 May '18

09 May '18

commit bf3e899dcef368a021033c6845b93c08884dae02 Merge: b116710e3 75f3fbaa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:26:49 2018 -0400 Merge branch 'libressl_201805_029' into maint-0.3.3 changes/ticket26006 | 4 ++++ src/common/compat_openssl.h | 6 +++++- src/test/test_tortls.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --cc src/common/compat_openssl.h index 1299ac36b,76679872b..d1481fb46 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@@ -8,7 -8,9 +8,8 @@@ #define TOR_COMPAT_OPENSSL_H #include <openssl/opensslv.h> -// workaround for libressl; not needed in later Tor versions. -#include <openssl/crypto.h> +#include "crypto_openssl_mgt.h" + /** * \file compat_openssl.h * @@@ -25,10 -27,13 +26,13 @@@ /* We define this macro if we're trying to build with the majorly refactored * API in OpenSSL 1.1 */ #define OPENSSL_1_1_API -#endif +#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ - #ifndef OPENSSL_1_1_API + #ifndef OPENSSL_VERSION #define OPENSSL_VERSION SSLEAY_VERSION + #endif + + #ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay()

1 0

[tor/maint-0.3.3] LibreSSL compatibility fixes.
by nickm＠torproject.org 09 May '18

09 May '18

commit 75f3fbaa3c7316fcef3509ef1e3813b94d8c4c8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:18:48 2018 -0400 LibreSSL compatibility fixes. LibreSSL, despite not having the OpenSSL 1.1 API, does define OPENSSL_VERSION in crypto.h. Additionally, it apparently annotates some functions as returning NULL, so that our unit tests need to be more careful about checking for NULL so they don't get compilation warnings. Closes ticket 26006. --- changes/ticket26006 | 4 ++++ src/common/compat_openssl.h | 7 ++++++- src/test/test_tortls.c | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/ticket26006 b/changes/ticket26006 new file mode 100644 index 000000000..e33e3f1cd --- /dev/null +++ b/changes/ticket26006 @@ -0,0 +1,4 @@ + o Minor features (compilation, portability): + - Avoid some compilation warnings with recent versions + of LibreSSL. Closes ticket 26006. + diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 1bfe18807..76679872b 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -8,6 +8,8 @@ #define TOR_COMPAT_OPENSSL_H #include <openssl/opensslv.h> +// workaround for libressl; not needed in later Tor versions. +#include <openssl/crypto.h> /** * \file compat_openssl.h @@ -27,8 +29,11 @@ #define OPENSSL_1_1_API #endif -#ifndef OPENSSL_1_1_API +#ifndef OPENSSL_VERSION #define OPENSSL_VERSION SSLEAY_VERSION +#endif + +#ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 47455cff8..5028a9540 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -840,8 +840,10 @@ test_tortls_classify_client_ciphers(void *ignored) sk_SSL_CIPHER_zero(ciphers); one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256"); + tt_assert(two); two->id = 0x0000; sk_SSL_CIPHER_push(ciphers, one); tls->client_cipher_list_type = 0; @@ -912,6 +914,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) ciphers = sk_SSL_CIPHER_new_null(); SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; sk_SSL_CIPHER_push(ciphers, one); sess->ciphers = ciphers;

1 0

[tor/maint-0.3.3] Merge branch 'libressl_201805_033' into maint-0.3.3
by nickm＠torproject.org 09 May '18

09 May '18

commit a639a67844909bd05fadaea5c1847f5e9af55cde Merge: b979415e8 bf3e899dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 08:25:32 2018 -0400 Merge branch 'libressl_201805_033' into maint-0.3.3 changes/ticket26006 | 4 ++++ src/common/compat_openssl.h | 6 +++++- src/test/test_tortls.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/master] LibreSSL compatibility fixes.
by nickm＠torproject.org 09 May '18

09 May '18

commit 75f3fbaa3c7316fcef3509ef1e3813b94d8c4c8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:18:48 2018 -0400 LibreSSL compatibility fixes. LibreSSL, despite not having the OpenSSL 1.1 API, does define OPENSSL_VERSION in crypto.h. Additionally, it apparently annotates some functions as returning NULL, so that our unit tests need to be more careful about checking for NULL so they don't get compilation warnings. Closes ticket 26006. --- changes/ticket26006 | 4 ++++ src/common/compat_openssl.h | 7 ++++++- src/test/test_tortls.c | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/ticket26006 b/changes/ticket26006 new file mode 100644 index 000000000..e33e3f1cd --- /dev/null +++ b/changes/ticket26006 @@ -0,0 +1,4 @@ + o Minor features (compilation, portability): + - Avoid some compilation warnings with recent versions + of LibreSSL. Closes ticket 26006. + diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 1bfe18807..76679872b 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -8,6 +8,8 @@ #define TOR_COMPAT_OPENSSL_H #include <openssl/opensslv.h> +// workaround for libressl; not needed in later Tor versions. +#include <openssl/crypto.h> /** * \file compat_openssl.h @@ -27,8 +29,11 @@ #define OPENSSL_1_1_API #endif -#ifndef OPENSSL_1_1_API +#ifndef OPENSSL_VERSION #define OPENSSL_VERSION SSLEAY_VERSION +#endif + +#ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 47455cff8..5028a9540 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -840,8 +840,10 @@ test_tortls_classify_client_ciphers(void *ignored) sk_SSL_CIPHER_zero(ciphers); one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256"); + tt_assert(two); two->id = 0x0000; sk_SSL_CIPHER_push(ciphers, one); tls->client_cipher_list_type = 0; @@ -912,6 +914,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) ciphers = sk_SSL_CIPHER_new_null(); SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; sk_SSL_CIPHER_push(ciphers, one); sess->ciphers = ciphers;

1 0