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

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 28 Jun '16

28 Jun '16

commit 300e1eea21fe9ea305fda106cac89879e6774e55 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 28 05:17:59 2016 +0000 Update translations for tor-messenger-ircproperties --- el/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/irc.properties b/el/irc.properties index 2db0ef3..7ee0244 100644 --- a/el/irc.properties +++ b/el/irc.properties @@ -162,11 +162,11 @@ error.unavailable=%S προσωρινά δεν είναι διαθέσιμο # %S is the channel name. error.channelBanned=You have been banned from %S. error.cannotSendToChannel=Δεν μπορείτε να στείλετε μήνυμα σε %S. -error.channelFull=The channel %S is full. +error.channelFull=Το κανάλι %S είναι γεμάτο error.inviteOnly=Πρέπει να προσκληθείτε για να συμμετάσχετε %S. error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once. -error.notChannelOp=You are not a channel operator on %S. -error.notChannelOwner=You are not a channel owner of %S. +error.notChannelOp=Δεν είστε χρήστης του καναλιού %S. +error.notChannelOwner=Δεν είστε ιδιοκτήτης του καναλιού %S. error.wrongKey=Cannot join %S, invalid channel password. error.sendMessageFailed=An error occurred while sending your last message. Please try again once the connection has been reestablished. # %1$S is the channel the user tried to join, %2$S is the channel

1 0

[webwml/master] Attempt to get rid of visible directory indices
by sebastian＠torproject.org 27 Jun '16

27 Jun '16

commit 94454cc9023e29377751eb67da460ce19a0fa5e6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 28 00:12:06 2016 +0200 Attempt to get rid of visible directory indices --- .htaccess | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.htaccess b/.htaccess index 73a8e95..bf6a3dc 100644 --- a/.htaccess +++ b/.htaccess @@ -51,6 +51,17 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] # Relays RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] +# Index Pages +RewriteRule ^about/$ /about/overview [R=301,L] +RewriteRule ^cgi-bin/$ / [R=301,L] +RewriteRule ^css/$ / [R=301,L] +RewriteRule ^docs/$ /docs/documentation [R=301,L] +RewriteRule ^eff/$ / [R=301,L] +RewriteRule ^en/$ / [R=301,L] +RewriteRule ^images/$ / [R=301,L] +RewriteRule ^include/$ / [R=301,L] +RewriteRule ^js/$ / [R=301,L] + # Donation campagin RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jun '16

27 Jun '16

commit b77fd797821ff91c73f32743776b02c0edca98dd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 27 21:15:28 2016 +0000 Update translations for https_everywhere --- es_MX/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index fb68952..cce2b10 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.about.add_new_rule "Añade Nueva Regla"> <!ENTITY https-everywhere.about.thanks "Gracias a"> <!ENTITY https-everywhere.about.many_contributors "Muchisimos contribuidores, incluyendo "> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.noscript "Ademas, las porciones de HTTPS Everywhere se basan en el codijo de NoScript escrito por Giorgio Maone y otoros. ¡Estamos muy agredcidos para su trabajo excellente!"> <!ENTITY https-everywhere.about.contribute "Si te gusta HTTPS Everywhere, podrias considerar"> <!ENTITY https-everywhere.about.donate_tor "Donar a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> @@ -40,9 +40,9 @@ <!ENTITY https-everywhere.prefs.view_xml_source "Ver fuente XML"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas Estables"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "A fuerza utilizar conexiones encriptado para estas sitios de web"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas Experimentales"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Puede causar advertencias o rotura. Desactivado de manera predeterminada"> <!ENTITY https-everywhere.chrome.add_rule "Añadir una regla para este sitio"> <!ENTITY https-everywhere.chrome.add_new_rule "Añadir una regla neuva para este sitio"> <!ENTITY https-everywhere.chrome.always_https_for_host "Utilizar siempre https para este host"> @@ -50,8 +50,8 @@ <!ENTITY https-everywhere.chrome.show_advanced "Enseña avanzado"> <!ENTITY https-everywhere.chrome.hide_advanced "Esconde avanzado"> <!ENTITY https-everywhere.chrome.rule_name "nombre de regla"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> +<!ENTITY https-everywhere.chrome.regex "Regex coincidente"> +<!ENTITY https-everywhere.chrome.redirect_to "Redirigir a "> <!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jun '16

27 Jun '16

commit 5b9885b3ddf66bc968059b786c23c9a0e4be3017 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 27 21:15:03 2016 +0000 Update translations for bridgedb --- es_MX/LC_MESSAGES/bridgedb.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 6689be6..14bc623 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Bernard Rodriguez <hey.bernard(a)gmail.com>, 2016 # manuelglz <cglzmtzg(a)gmail.com>, 2014 # Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 # Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2016 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-05-09 14:10+0000\n" -"Last-Translator: tonyskapunk <tonysk8(a)gmx.net>\n" +"PO-Revision-Date: 2016-06-27 21:10+0000\n" +"Last-Translator: Bernard Rodriguez <hey.bernard(a)gmail.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,7 +264,7 @@ msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "¡Necessito una forma alternativo de conectar con puentes!" #: bridgedb/strings.py:108 #, python-format @@ -271,17 +272,17 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Otro modo de consigir puentes es mandar un correo electronico a %s. Tenga en cuenta que debe enviar el correco electronico con dirección de uno de los siguientes proveedores de correo electrónico: %s, %s or %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Si tu Tor no funciona, usted debe enviar por correo electrónico %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jun '16

27 Jun '16

commit 39b3579586a8d74c7c99c286b331af516ee255b2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 27 20:45:28 2016 +0000 Update translations for https_everywhere --- es_MX/https-everywhere.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index 5ca9d53..fb68952 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -4,7 +4,7 @@ <!ENTITY https-everywhere.about.version "Versión"> <!ENTITY https-everywhere.about.created_by "Creado por"> <!ENTITY https-everywhere.about.and ", y"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> +<!ENTITY https-everywhere.about.librarians "Bibliotecarios de conjuntos de reglas"> <!ENTITY https-everywhere.about.add_new_rule "Añade Nueva Regla"> <!ENTITY https-everywhere.about.thanks "Gracias a"> <!ENTITY https-everywhere.about.many_contributors "Muchisimos contribuidores, incluyendo "> @@ -21,8 +21,8 @@ <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "Bloquea todos los pedidos HTTP"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.showCounter "Enseña contador "> +<!ENTITY https-everywhere.menu.viewAllRules "Ver todo las reglas"> <!ENTITY https-everywhere.prefs.title "Preferencias de HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "Habilitar Todos"> @@ -33,23 +33,23 @@ <!ENTITY https-everywhere.prefs.notes "Notas"> <!ENTITY https-everywhere.prefs.list_caption "Cuales reglas de redirection de HTTPS deberían ser aplicadas?"> <!ENTITY https-everywhere.prefs.enabled "Habilitado"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Tu pueudes aprender como a escribir tus propios conjuntos de reglas (para añadir apoyo para los otros sitios de web)"> <!ENTITY https-everywhere.prefs.here_link "aqui"> <!ENTITY https-everywhere.prefs.toggle "Alternar"> <!ENTITY https-everywhere.prefs.reset_default "Restaurar a Estado Predeterminado"> -<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source"> +<!ENTITY https-everywhere.prefs.view_xml_source "Ver fuente XML"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas Estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas Experimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.add_rule "Añadir una regla para este sitio"> +<!ENTITY https-everywhere.chrome.add_new_rule "Añadir una regla neuva para este sitio"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Utilizar siempre https para este host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.show_advanced "Enseña avanzado"> +<!ENTITY https-everywhere.chrome.hide_advanced "Esconde avanzado"> +<!ENTITY https-everywhere.chrome.rule_name "nombre de regla"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> <!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> <!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">

1 0

[tor/master] Remove an always-true condition: all ints are <= INT_MAX
by nickm＠torproject.org 27 Jun '16

27 Jun '16

commit 14169a3d703315de703a06bc61855aba8ef7ede8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 27 13:18:54 2016 -0400 Remove an always-true condition: all ints are <= INT_MAX --- src/or/directory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 5886a73..1fe4d68 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3839,8 +3839,7 @@ download_status_schedule_get_delay(download_status_t *dls, schedule != NULL); /* If we're using random exponential backoff, we do need min/max delay */ tor_assert(dls->backoff != DL_SCHED_RANDOM_EXPONENTIAL || - (min_delay >= 0 && max_delay >= min_delay && - max_delay <= INT_MAX)); + (min_delay >= 0 && max_delay >= min_delay)); int delay = INT_MAX; uint8_t dls_schedule_position = (dls->increment_on

1 0

[tor/master] Add missing braces around conditional.
by nickm＠torproject.org 27 Jun '16

27 Jun '16

commit 4e2a7cd3aef479eb4af299fd67392f6e98090b78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 27 13:19:49 2016 -0400 Add missing braces around conditional. --- src/or/routerparse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 569c73f..6550fa6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3208,10 +3208,11 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, if ((rs = routerstatus_parse_entry_from_string(rs_area, &s, rs_tokens, NULL, NULL, ns->consensus_method, - flav))) + flav))) { /* Use exponential-backoff scheduling when downloading microdescs */ rs->dl_status.backoff = DL_SCHED_RANDOM_EXPONENTIAL; smartlist_add(ns->routerstatus_list, rs); + } } } for (i = 1; i < smartlist_len(ns->routerstatus_list); ++i) {

1 0

[tor/master] Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL.
by nickm＠torproject.org 27 Jun '16

27 Jun '16

commit 0116eae59a35e4303ca179d6b0fb0302a83e87a1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 24 22:20:41 2016 +0000 Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL. The previous version of the new accessors didn't specify const but it was changed in master. --- changes/bug19499 | 4 ++++ src/common/crypto.c | 24 ++++++++++++------------ src/tools/tor-checkkey.c | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/changes/bug19499 b/changes/bug19499 new file mode 100644 index 0000000..5db49bb --- /dev/null +++ b/changes/bug19499 @@ -0,0 +1,4 @@ + o Minor features (build): + - Tor now again builds with the recent OpenSSL 1.1 development branch + (tested against 1.1.0-pre6-dev). + diff --git a/src/common/crypto.c b/src/common/crypto.c index 8d990d3..2b96324 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -145,7 +145,7 @@ struct crypto_dh_t { }; static int setup_openssl_threading(void); -static int tor_check_dh_key(int severity, BIGNUM *bn); +static int tor_check_dh_key(int severity, const BIGNUM *bn); /** Return the number of bytes added by padding method <b>padding</b>. */ @@ -466,7 +466,7 @@ crypto_pk_private_ok(const crypto_pk_t *k) if (!k || !k->key) return 0; - BIGNUM *p, *q; + const BIGNUM *p, *q; RSA_get0_factors(k->key, &p, &q); return p != NULL; /* XXX/yawning: Should we check q? */ #else @@ -890,10 +890,10 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env) tor_assert(env); tor_assert(env->key); - BIGNUM *e; + const BIGNUM *e; #ifdef OPENSSL_1_1_API - BIGNUM *n, *d; + const BIGNUM *n, *d; RSA_get0_key(env->key, &n, &e, &d); #else e = env->key->e; @@ -919,11 +919,11 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_pk_t *b) if (an_argument_is_null) return result; - BIGNUM *a_n, *a_e; - BIGNUM *b_n, *b_e; + const BIGNUM *a_n, *a_e; + const BIGNUM *b_n, *b_e; #ifdef OPENSSL_1_1_API - BIGNUM *a_d, *b_d; + const BIGNUM *a_d, *b_d; RSA_get0_key(a->key, &a_n, &a_e, &a_d); RSA_get0_key(b->key, &b_n, &b_e, &b_d); #else @@ -975,7 +975,7 @@ crypto_pk_num_bits(crypto_pk_t *env) /* It's so stupid that there's no other way to check that n is valid * before calling RSA_bits(). */ - BIGNUM *n, *e, *d; + const BIGNUM *n, *e, *d; RSA_get0_key(env->key, &n, &e, &d); tor_assert(n != NULL); @@ -2420,7 +2420,7 @@ crypto_dh_generate_public(crypto_dh_t *dh) * recreating the DH object. I have no idea what sort of aliasing madness * can occur here, so do the check, and just bail on failure. */ - BIGNUM *pub_key, *priv_key; + const BIGNUM *pub_key, *priv_key; DH_get0_key(dh->dh, &pub_key, &priv_key); if (tor_check_dh_key(LOG_WARN, pub_key)<0) { log_warn(LD_CRYPTO, "Weird! Our own DH key was invalid. I guess once-in-" @@ -2451,10 +2451,10 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, size_t pubkey_len) int bytes; tor_assert(dh); - BIGNUM *dh_pub; + const BIGNUM *dh_pub; #ifdef OPENSSL_1_1_API - BIGNUM *dh_priv; + const BIGNUM *dh_priv; DH_get0_key(dh->dh, &dh_pub, &dh_priv); #else dh_pub = dh->dh->pub_key; @@ -2493,7 +2493,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, size_t pubkey_len) * See http://www.cl.cam.ac.uk/ftp/users/rja14/psandqs.ps.gz for some tips. */ static int -tor_check_dh_key(int severity, BIGNUM *bn) +tor_check_dh_key(int severity, const BIGNUM *bn) { BIGNUM *x; char *s; diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index 8e957c2..3e16fd0 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -72,9 +72,9 @@ main(int c, char **v) } else { rsa = crypto_pk_get_rsa_(env); - BIGNUM *rsa_n; + const BIGNUM *rsa_n; #ifdef OPENSSL_1_1_API - BIGNUM *rsa_e, *rsa_d; + const BIGNUM *rsa_e, *rsa_d; RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); #else rsa_n = rsa->n;

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 27 Jun '16

27 Jun '16

commit 2197bfcc6a858af8f8ff41dba8825d676d18d37c Merge: 703254a 0116eae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 27 13:17:42 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19499 | 4 ++++ src/common/crypto.c | 24 ++++++++++++------------ src/tools/tor-checkkey.c | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-)

1 0

[tor/maint-0.2.8] Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL.
by nickm＠torproject.org 27 Jun '16

27 Jun '16

commit 0116eae59a35e4303ca179d6b0fb0302a83e87a1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 24 22:20:41 2016 +0000 Bug19499: Fix GCC warnings when building against bleeding edge OpenSSL. The previous version of the new accessors didn't specify const but it was changed in master. --- changes/bug19499 | 4 ++++ src/common/crypto.c | 24 ++++++++++++------------ src/tools/tor-checkkey.c | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/changes/bug19499 b/changes/bug19499 new file mode 100644 index 0000000..5db49bb --- /dev/null +++ b/changes/bug19499 @@ -0,0 +1,4 @@ + o Minor features (build): + - Tor now again builds with the recent OpenSSL 1.1 development branch + (tested against 1.1.0-pre6-dev). + diff --git a/src/common/crypto.c b/src/common/crypto.c index 8d990d3..2b96324 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -145,7 +145,7 @@ struct crypto_dh_t { }; static int setup_openssl_threading(void); -static int tor_check_dh_key(int severity, BIGNUM *bn); +static int tor_check_dh_key(int severity, const BIGNUM *bn); /** Return the number of bytes added by padding method <b>padding</b>. */ @@ -466,7 +466,7 @@ crypto_pk_private_ok(const crypto_pk_t *k) if (!k || !k->key) return 0; - BIGNUM *p, *q; + const BIGNUM *p, *q; RSA_get0_factors(k->key, &p, &q); return p != NULL; /* XXX/yawning: Should we check q? */ #else @@ -890,10 +890,10 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env) tor_assert(env); tor_assert(env->key); - BIGNUM *e; + const BIGNUM *e; #ifdef OPENSSL_1_1_API - BIGNUM *n, *d; + const BIGNUM *n, *d; RSA_get0_key(env->key, &n, &e, &d); #else e = env->key->e; @@ -919,11 +919,11 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_pk_t *b) if (an_argument_is_null) return result; - BIGNUM *a_n, *a_e; - BIGNUM *b_n, *b_e; + const BIGNUM *a_n, *a_e; + const BIGNUM *b_n, *b_e; #ifdef OPENSSL_1_1_API - BIGNUM *a_d, *b_d; + const BIGNUM *a_d, *b_d; RSA_get0_key(a->key, &a_n, &a_e, &a_d); RSA_get0_key(b->key, &b_n, &b_e, &b_d); #else @@ -975,7 +975,7 @@ crypto_pk_num_bits(crypto_pk_t *env) /* It's so stupid that there's no other way to check that n is valid * before calling RSA_bits(). */ - BIGNUM *n, *e, *d; + const BIGNUM *n, *e, *d; RSA_get0_key(env->key, &n, &e, &d); tor_assert(n != NULL); @@ -2420,7 +2420,7 @@ crypto_dh_generate_public(crypto_dh_t *dh) * recreating the DH object. I have no idea what sort of aliasing madness * can occur here, so do the check, and just bail on failure. */ - BIGNUM *pub_key, *priv_key; + const BIGNUM *pub_key, *priv_key; DH_get0_key(dh->dh, &pub_key, &priv_key); if (tor_check_dh_key(LOG_WARN, pub_key)<0) { log_warn(LD_CRYPTO, "Weird! Our own DH key was invalid. I guess once-in-" @@ -2451,10 +2451,10 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, size_t pubkey_len) int bytes; tor_assert(dh); - BIGNUM *dh_pub; + const BIGNUM *dh_pub; #ifdef OPENSSL_1_1_API - BIGNUM *dh_priv; + const BIGNUM *dh_priv; DH_get0_key(dh->dh, &dh_pub, &dh_priv); #else dh_pub = dh->dh->pub_key; @@ -2493,7 +2493,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, size_t pubkey_len) * See http://www.cl.cam.ac.uk/ftp/users/rja14/psandqs.ps.gz for some tips. */ static int -tor_check_dh_key(int severity, BIGNUM *bn) +tor_check_dh_key(int severity, const BIGNUM *bn) { BIGNUM *x; char *s; diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index 8e957c2..3e16fd0 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -72,9 +72,9 @@ main(int c, char **v) } else { rsa = crypto_pk_get_rsa_(env); - BIGNUM *rsa_n; + const BIGNUM *rsa_n; #ifdef OPENSSL_1_1_API - BIGNUM *rsa_e, *rsa_d; + const BIGNUM *rsa_e, *rsa_d; RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); #else rsa_n = rsa->n;

1 0