November 2020 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 02 Nov '20

02 Nov '20

commit a8c018390d6fc935932b5764883317d439fa124f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 2 23:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ca.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+ca.po b/contents+ca.po index 854daf79b1..b1168976c1 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -50,17 +50,21 @@ msgid "" "Whether you have a lot of time to volunteer or a little, and whether you " "consider yourself technical or not, we want you to join our community, too." msgstr "" +"Tant si teniu molt de temps per a ser voluntari com si en teniu poc, i tant " +"si us considereu tècnic com si no, també volem que us uniu a la comunitat." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" "Below you'll find some different ways to volunteer with the Tor community as" " well as resources to help you help Tor." msgstr "" +"A sota trobareu diverses maneres de ser voluntari de la comunitat Tor, així " +"com recursos per ajudar-vos a ajudar el Tor." #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.title) msgid "Relay operations" -msgstr "" +msgstr "Operacions en relés" #: https//community.torproject.org/relay/ #: (content/relay-operations/contents+en.lrpage.subtitle)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 02 Nov '20

02 Nov '20

commit a20af156bc117adf0d9908d6f0a5561da421cbc2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 2 23:15:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ca.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 09156c4b41..854daf79b1 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1,12 +1,13 @@ +# # Translators: # Benny Beat <bennybeat(a)gmail.com>, 2019 # Emma Peel, 2019 # erinm, 2019 -# Ecron <ecron_89(a)hotmail.com>, 2019 # Assumpta, 2019 # Ricard Llenas <ricardllenas(a)gmail.com>, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2020 # jmontane, 2020 +# Ecron <ecron_89(a)hotmail.com>, 2020 # msgid "" msgstr "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: jmontane, 2020\n" +"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2020\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "" #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "The Tor community is made up of all kinds of contributors." -msgstr "" +msgstr "La comunitat Tot està formada per tota mena de col·laboradors." #: https//community.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -434,7 +435,7 @@ msgstr "" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Bandwidth and Connections" -msgstr "" +msgstr "# Ample de banda i connexions" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[tor/master] Include a more modest openssl header in crypto_openssl_mgt.h
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit d9221968ce3daed75d698f333f8bea0bf742ddf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 10:07:56 2020 -0400 Include a more modest openssl header in crypto_openssl_mgt.h The "engines.h" header has lots of stuff; the "opensslv.h" header has the version number, which is all we actually need here. We need to do this because we're about to change this header to conditionally define OPENSSL_SUPPRESS_DEPRECATED, and it would be too late to do so if we'd already included "engines.h". --- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h index a3dd03aa04..8dbadfc9d2 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.h +++ b/src/lib/crypt_ops/crypto_openssl_mgt.h @@ -16,8 +16,7 @@ #include "orconfig.h" #ifdef ENABLE_OPENSSL -#include <openssl/engine.h> - +#include <openssl/opensslv.h> /* Macro to create an arbitrary OpenSSL version number as used by OPENSSL_VERSION_NUMBER or SSLeay(), since the actual numbers are a bit hard

1 0

[tor/master] Do not define OPENSSL_VERSION in compat_openssl.h
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit 2b4a3d07b25ae9c284a1f130de71940242b78bb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 10:32:06 2020 -0400 Do not define OPENSSL_VERSION in compat_openssl.h Apparently it conflicts with definitions elsewhere in Openssl 3.0.0. --- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/lib/crypt_ops/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h index 9c10386c34..6605d01045 100644 --- a/src/lib/crypt_ops/compat_openssl.h +++ b/src/lib/crypt_ops/compat_openssl.h @@ -32,10 +32,6 @@ #define OPENSSL_1_1_API #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ -#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() @@ -54,4 +50,3 @@ #endif /* defined(ENABLE_OPENSSL) */ #endif /* !defined(TOR_COMPAT_OPENSSL_H) */ - diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index c97815f9a4..e7d6084f6c 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -101,13 +101,22 @@ static char *crypto_openssl_version_str = NULL; const char * crypto_openssl_get_version_str(void) { +#ifdef OPENSSL_VERSION + const int query = OPENSSL_VERSION; +#else + /* This old name was changed around OpenSSL 1.1.0 */ + const int query = SSLEAY_VERSION; +#endif + if (crypto_openssl_version_str == NULL) { - const char *raw_version = OpenSSL_version(OPENSSL_VERSION); + const char *raw_version = OpenSSL_version(query); crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; } +#undef QUERY_OPENSSL_VERSION + static char *crypto_openssl_header_version_str = NULL; /* Return a human-readable version of the compile-time openssl version * number. */ @@ -208,7 +217,7 @@ crypto_openssl_early_init(void) setup_openssl_threading(); unsigned long version_num = OpenSSL_version_num(); - const char *version_str = OpenSSL_version(OPENSSL_VERSION); + const char *version_str = crypto_openssl_get_version_str(); if (version_num == OPENSSL_VERSION_NUMBER && !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers "

1 0

[tor/master] Changes file for #40165 (openssl deprecation warnings)
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit 59f76a8a1fd0fffe3ccf083bcad49435d6226a8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 10:34:18 2020 -0400 Changes file for #40165 (openssl deprecation warnings) --- changes/ticket40165 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket40165 b/changes/ticket40165 new file mode 100644 index 0000000000..a8dd0a339b --- /dev/null +++ b/changes/ticket40165 @@ -0,0 +1,5 @@ + o Minor features (compilation): + - Disable deprecation warnings when building with OpenSSL 3.0.0 or later. + There are a number of newly deprecated APIs in OpenSSL 3.0.0 that Tor + still requires. (A later version of Tor will try to stop depending on + these.) Closes ticket 40165.

1 0

[tor/master] configure: disable OpenSSL deprecation warnings with OpenSSL >= 3
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit e399d32cdf8b77b68345290f59bb315d3ed7a5d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 10:30:24 2020 -0400 configure: disable OpenSSL deprecation warnings with OpenSSL >= 3 We can't do this in the C headers, since by the time we include `opensslv.h` in order to check the openssl version number, we will have included `openssl/macros.h`, which is the thing that checks whether we disabled deprecation warnings. --- configure.ac | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f30a7efa91..6c8456d0c7 100644 --- a/configure.ac +++ b/configure.ac @@ -937,13 +937,30 @@ LIBS="$TOR_OPENSSL_LIBS $LIBS" LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" +dnl Tor currently uses a number of APIs that are deprecated in OpenSSL 3.0.0 +dnl and later. We want to migrate away from them, but that will be a lot of +dnl work. (See ticket tor#40166.) For now, we disable the deprecation +dnl warnings. + +AC_MSG_CHECKING([for OpenSSL >= 3.0.0]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <openssl/opensslv.h> +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER <= 0x30000000L +#error "you_have_version_3" +#endif + ]], [[]])], + [ AC_MSG_RESULT([no]) ], + [ AC_MSG_RESULT([yes]); + AC_DEFINE(OPENSSL_SUPPRESS_DEPRECATED, 1, [disable openssl deprecated-function warnings]) ]) + +AC_MSG_CHECKING([for OpenSSL < 1.0.1]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <openssl/opensslv.h> #if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1000100fL #error "too old" #endif ]], [[]])], - [ : ], + [ AC_MSG_RESULT([no]) ], [ AC_MSG_ERROR([OpenSSL is too old. We require 1.0.1 or later. You can specify a path to a newer one with --with-openssl-dir.]) ]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

1 0

[tor/master] Fix a previously overstrict log message check.
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit c48d25ac8d5cb8320a56a61cbee7754420d77309 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 10:47:39 2020 -0400 Fix a previously overstrict log message check. OpenSSL doesn't seem to report error locations in the same way as before, which broke one of our tests. Fixes bug 40170; bugfix on 0.2.8.1-alpha. --- changes/ticket40170 | 3 +++ src/test/test_tortls_openssl.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/ticket40170 b/changes/ticket40170 new file mode 100644 index 0000000000..cc1c8dbad1 --- /dev/null +++ b/changes/ticket40170 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix the "tortls/openssl/log_one_error" test to work with OpenSSL 3.0.0. + Fixes bug 40170; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index f039980a25..f4e3430dac 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -283,8 +283,7 @@ test_tortls_log_one_error(void *ignored) mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, 3), LOG_WARN, 0, NULL); - expect_log_msg("TLS error with 127.hello: " - "BN lib (in unknown library:(null):---)\n"); + expect_log_msg_containing("TLS error with 127.hello"); mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_HTTP_REQUEST),

1 0

[tor/master] Merge branch 'tor-gitlab/mr/186'
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit 474369e3fa5068d616c25f412608749527231e71 Merge: 8b240fbe40 c48d25ac8d Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 2 13:14:02 2020 -0500 Merge branch 'tor-gitlab/mr/186' changes/ticket40165 | 5 +++++ changes/ticket40170 | 3 +++ configure.ac | 19 ++++++++++++++++++- src/lib/crypt_ops/compat_openssl.h | 5 ----- src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++++++++++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/188'
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit 8b240fbe404ce7505c7b2c661dae66d8ecb6c904 Merge: 7a75a1064f f7d0bde4f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 2 13:09:15 2020 -0500 Merge branch 'tor-gitlab/mr/188' changes/ticket22473 | 3 + src/feature/control/control_getinfo.c | 13 ----- src/feature/control/fmt_serverstatus.c | 103 --------------------------------- src/feature/control/fmt_serverstatus.h | 18 ------ src/feature/control/include.am | 2 - 5 files changed, 3 insertions(+), 136 deletions(-)

1 0

[tor/master] Remove "GETINFO network-status".
by dgoulet＠torproject.org 02 Nov '20

02 Nov '20

commit f7d0bde4f0d69d815c90b70f4bf8b7f9efddceaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 11:47:06 2020 -0400 Remove "GETINFO network-status". It was deprecated 0.3.1.1-alpha. According to #22473, nothing uses it. Closes #22473. --- changes/ticket22473 | 3 + src/feature/control/control_getinfo.c | 13 ----- src/feature/control/fmt_serverstatus.c | 103 --------------------------------- src/feature/control/fmt_serverstatus.h | 18 ------ src/feature/control/include.am | 2 - 5 files changed, 3 insertions(+), 136 deletions(-) diff --git a/changes/ticket22473 b/changes/ticket22473 new file mode 100644 index 0000000000..c7496f9da7 --- /dev/null +++ b/changes/ticket22473 @@ -0,0 +1,3 @@ + o Removed features (controller): + - Remove the "GETINFO network-status" controller command. It has + been deprecated since 0.3.1.1-alpha. Closes ticket 22473. diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index cfac59d499..5feadd23d1 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -29,7 +29,6 @@ #include "feature/control/control_fmt.h" #include "feature/control/control_getinfo.h" #include "feature/control/control_proto.h" -#include "feature/control/fmt_serverstatus.h" #include "feature/control/getinfo_geoip.h" #include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" @@ -721,18 +720,6 @@ getinfo_helper_dir(control_connection_t *control_conn, if (consensus_result < 0) { return -1; } - } else if (!strcmp(question, "network-status")) { /* v1 */ - static int network_status_warned = 0; - if (!network_status_warned) { - log_warn(LD_CONTROL, "GETINFO network-status is deprecated; it will " - "go away in a future version of Tor."); - network_status_warned = 1; - } - routerlist_t *routerlist = router_get_routerlist(); - if (!routerlist || !routerlist->routers || - list_server_status_v1(routerlist->routers, answer, 1) < 0) { - return -1; - } } else if (!strcmpstart(question, "extra-info/digest/")) { question += strlen("extra-info/digest/"); if (strlen(question) == HEX_DIGEST_LEN) { diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c deleted file mode 100644 index ed9ad95ce2..0000000000 --- a/src/feature/control/fmt_serverstatus.c +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2020, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * @file fmt_serverstatus.c - * @brief Format relay info for a controller. - **/ - -#include "core/or/or.h" -#include "feature/control/fmt_serverstatus.h" - -#include "app/config/config.h" -#include "feature/dirauth/authmode.h" -#include "feature/dirauth/voteflags.h"// XXXX remove -#include "feature/nodelist/describe.h" -#include "feature/nodelist/nodelist.h" - -#include "feature/nodelist/node_st.h" -#include "feature/nodelist/routerinfo_st.h" - -/** - * Allocate and return a description of the status of the server desc, - * for use in a v1-style router-status line. The server is listed - * as running iff is_live is true. - * - * This is deprecated: it's only used for controllers that want outputs in - * the old format. - */ -static char * -list_single_server_status(const routerinfo_t *desc, int is_live) -{ - char buf[MAX_NICKNAME_LEN+HEX_DIGEST_LEN+4]; /* !nickname=$hexdigest\0 */ - char *cp; - const node_t *node; - - tor_assert(desc); - - cp = buf; - if (!is_live) { - *cp++ = '!'; - } - node = node_get_by_id(desc->cache_info.identity_digest); - if (node && node->is_valid) { - strlcpy(cp, desc->nickname, sizeof(buf)-(cp-buf)); - cp += strlen(cp); - *cp++ = '='; - } - *cp++ = '$'; - base16_encode(cp, HEX_DIGEST_LEN+1, desc->cache_info.identity_digest, - DIGEST_LEN); - return tor_strdup(buf); -} - -/** Based on the routerinfo_ts in routers, allocate the - * contents of a v1-style router-status line, and store it in - * *router_status_out. Return 0 on success, -1 on failure. - * - * If for_controller is true, include the routers with very old descriptors. - * - * This is deprecated: it's only used for controllers that want outputs in - * the old format. - */ -int -list_server_status_v1(smartlist_t *routers, char **router_status_out, - int for_controller) -{ - /* List of entries in a router-status style: An optional !, then an optional - * equals-suffixed nickname, then a dollar-prefixed hexdigest. */ - smartlist_t *rs_entries; - time_t now = time(NULL); - time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH; - /* We include v2 dir auths here too, because they need to answer - * controllers. Eventually we'll deprecate this whole function; - * see also networkstatus_getinfo_by_purpose(). */ - tor_assert(router_status_out); - - rs_entries = smartlist_new(); - - SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) { - const node_t *node = node_get_by_id(ri->cache_info.identity_digest); - tor_assert(node); - if (for_controller) { - char name_buf[MAX_VERBOSE_NICKNAME_LEN+2]; - char *cp = name_buf; - if (!node->is_running) - *cp++ = '!'; - router_get_verbose_nickname(cp, ri); - smartlist_add_strdup(rs_entries, name_buf); - } else if (ri->cache_info.published_on >= cutoff) { - smartlist_add(rs_entries, list_single_server_status(ri, - node->is_running)); - } - } SMARTLIST_FOREACH_END(ri); - - *router_status_out = smartlist_join_strings(rs_entries, " ", 0, NULL); - - SMARTLIST_FOREACH(rs_entries, char *, cp, tor_free(cp)); - smartlist_free(rs_entries); - - return 0; -} diff --git a/src/feature/control/fmt_serverstatus.h b/src/feature/control/fmt_serverstatus.h deleted file mode 100644 index 9dd9fe125c..0000000000 --- a/src/feature/control/fmt_serverstatus.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2001 Matej Pfajfar. - * Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2020, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * \file fmt_serverstatus.h - * \brief Header file for fmt_serverstatus.c. - **/ - -#ifndef TOR_FMT_SERVERSTATUS_H -#define TOR_FMT_SERVERSTATUS_H - -int list_server_status_v1(smartlist_t *routers, char **router_status_out, - int for_controller); - -#endif /* !defined(TOR_FMT_SERVERSTATUS_H) */ diff --git a/src/feature/control/include.am b/src/feature/control/include.am index 07094f23bb..101fe3c705 100644 --- a/src/feature/control/include.am +++ b/src/feature/control/include.am @@ -15,7 +15,6 @@ LIBTOR_APP_A_SOURCES += \ src/feature/control/control_fmt.c \ src/feature/control/control_getinfo.c \ src/feature/control/control_proto.c \ - src/feature/control/fmt_serverstatus.c \ src/feature/control/getinfo_geoip.c # ADD_C_FILE: INSERT HEADERS HERE. @@ -35,5 +34,4 @@ noinst_HEADERS += \ src/feature/control/control_fmt.h \ src/feature/control/control_getinfo.h \ src/feature/control/control_proto.h \ - src/feature/control/fmt_serverstatus.h \ src/feature/control/getinfo_geoip.h

1 0