April 2019 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Apr '19

12 Apr '19

commit 197f24444117940e3ee105d3ef3e81fc0ff21f14 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 13:20:06 2019 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 98f2e1f47..9f947e282 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-12 08:10+0000\n" -"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>\n" +"PO-Revision-Date: 2019-04-12 12:58+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +46,7 @@ msgstr "Une mise à jour de sécurité est proposée pour le Navigateur Tor." msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " "download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/\">Cliquez ici pour aller sur la page de téléchargement</a>" +msgstr "<a href=\"https://www.torproject.org/download/fr\">Cliquez ici pour aller sur la page de téléchargement</a>" msgid "Sorry. You are not using Tor." msgstr "Désolé. Vous n’utilisez pas Tor." @@ -56,7 +56,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">a la foire aux questions</a>." +msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/fr\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://support.torproject.org/fr/#faq\">questions les plus fréquentes</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Désolé, votre demande a échoué ou une réponse inattendue a été reçue."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Apr '19

12 Apr '19

commit c62346c26432d9be748e5df4974d3f7705cbabc8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 13:19:59 2019 +0000 Update translations for torcheck --- fr/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 98f2e1f47..9f947e282 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-12 08:10+0000\n" -"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>\n" +"PO-Revision-Date: 2019-04-12 12:58+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +46,7 @@ msgstr "Une mise à jour de sécurité est proposée pour le Navigateur Tor." msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " "download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/\">Cliquez ici pour aller sur la page de téléchargement</a>" +msgstr "<a href=\"https://www.torproject.org/download/fr\">Cliquez ici pour aller sur la page de téléchargement</a>" msgid "Sorry. You are not using Tor." msgstr "Désolé. Vous n’utilisez pas Tor." @@ -56,7 +56,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">a la foire aux questions</a>." +msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/fr\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://support.torproject.org/fr/#faq\">questions les plus fréquentes</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Désolé, votre demande a échoué ou une réponse inattendue a été reçue."

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 12 Apr '19

12 Apr '19

commit 58c418851a32ebffe49fb1180dc7830af03c648d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 12:49:39 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- fr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties index 379a8fa2c..edcab8aad 100644 --- a/fr/browserOnboarding.properties +++ b/fr/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Aller vers Sécurité onboarding.tour-tor-security=Sécurité onboarding.tour-tor-security.title=Choisissez votre expérience. onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. -onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS Everywhere ne sont inclus dans la barre d’outils, mais vous pouvez personnaliser votre barre d’outil pour les ajouter. +onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS partout n’apparaissent pas dans la barre d’outils, mais vous pouvez la personnaliser pour les ajouter. onboarding.tour-tor-security-level.button=Voir votre niveau de sécurité onboarding.tour-tor-security-level.next-button=Aller vers Conseils sur l’expérience

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 12 Apr '19

12 Apr '19

commit 66b652fc3d85a6d5fa736c3ce827ed9f456df1eb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 12:49:33 2019 +0000 Update translations for torbutton-browseronboardingproperties --- fr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties index 379a8fa2c..edcab8aad 100644 --- a/fr/browserOnboarding.properties +++ b/fr/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Aller vers Sécurité onboarding.tour-tor-security=Sécurité onboarding.tour-tor-security.title=Choisissez votre expérience. onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. -onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS Everywhere ne sont inclus dans la barre d’outils, mais vous pouvez personnaliser votre barre d’outil pour les ajouter. +onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS partout n’apparaissent pas dans la barre d’outils, mais vous pouvez la personnaliser pour les ajouter. onboarding.tour-tor-security-level.button=Voir votre niveau de sécurité onboarding.tour-tor-security-level.next-button=Aller vers Conseils sur l’expérience

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Apr '19

12 Apr '19

commit b8516b075f820299a5f58758487d761d99939eb4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 10:50:55 2019 +0000 Update translations for support-portal --- contents+pt-PT.po | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 0c0edac96..7ee122168 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1,10 +1,10 @@ # Translators: -# Emma Peel, 2018 # MS <manuelarodsilva(a)gmail.com>, 2018 # Hugo9191 <hugoncosta(a)gmail.com>, 2019 # erinm, 2019 # Rui <xymarior(a)yandex.com>, 2019 # Rui Melo <viper5000pt(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-08 17:07+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Rui Melo <viper5000pt(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,6 +145,9 @@ msgid "" "Browser](https://www.torproject.org/download) and then using it to navigate " "to the blocked site will allow access." msgstr "" +"Na maioria dos casos, simplesmente descarregar o [Tor Browser] " +"(https://www.torproject.org/download) e usá-lo para aceder ao website " +"bloqueado irá permitir o acesso." #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -526,6 +529,9 @@ msgid "" ".8_en-US.exe.asc C:\\Users\\Alice\\Desktop\\torbrowser-install-8.0.8_en-" "US.exe" msgstr "" +"gpg.exe --verify C:\\Users\\Alice\\Desktop\\torbrowser-install-win64-8.0" +".8_en-US.exe.asc C:\\Users\\Alice\\Desktop\\torbrowser-install-8.0.8_en-" +"US.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[tor/master] crypto_format: Remove outdated comments
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit 0d136a12bbc498991bcb364098021d0532d85ab0 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 13:58:23 2019 +1000 crypto_format: Remove outdated comments (These functions look pretty unified to me.) Part of 29660. --- src/lib/crypt_ops/crypto_format.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 84f73e527..f37ec1046 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -253,7 +253,6 @@ ed25519_signature_from_base64(ed25519_signature_t *sig, /** Base64 encode DIGEST_LINE bytes from digest, remove the trailing = * characters, and store the nul-terminated result in the first * BASE64_DIGEST_LEN+1 bytes of d64. */ -/* XXXX unify with crypto_format.c code */ int digest_to_base64(char *d64, const char *digest) { @@ -267,7 +266,6 @@ digest_to_base64(char *d64, const char *digest) /** Given a base64 encoded, nul-terminated digest in d64 (without * trailing newline or = characters), decode it and store the result in the * first DIGEST_LEN bytes at digest. */ -/* XXXX unify with crypto_format.c code */ int digest_from_base64(char *digest, const char *d64) { @@ -280,7 +278,6 @@ digest_from_base64(char *digest, const char *d64) /** Base64 encode DIGEST256_LINE bytes from digest, remove the * trailing = characters, and store the nul-terminated result in the first * BASE64_DIGEST256_LEN+1 bytes of d64. */ - /* XXXX unify with crypto_format.c code */ int digest256_to_base64(char *d64, const char *digest) { @@ -294,7 +291,6 @@ digest256_to_base64(char *d64, const char *digest) /** Given a base64 encoded, nul-terminated digest in d64 (without * trailing newline or = characters), decode it and store the result in the * first DIGEST256_LEN bytes at digest. */ -/* XXXX unify with crypto_format.c code */ int digest256_from_base64(char *digest, const char *d64) {

1 0

[tor/master] crypto_format: Remove the return value from curve25519_public_to_base64()
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit e3124fef54f90828f7b06c41fd4e39ef7778f2e3 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:06:30 2019 +1000 crypto_format: Remove the return value from curve25519_public_to_base64() And fix the documentation on the function: it does produce trailing "="s as padding. Also remove all checks for the return value, which were redundant anyway, because the function never failed. Part of 29660. --- src/feature/hs/hs_descriptor.c | 21 ++++++--------------- src/lib/crypt_ops/crypto_curve25519.h | 4 ++-- src/lib/crypt_ops/crypto_format.c | 23 +++++++++++++++-------- src/test/test_crypto.c | 2 +- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 8f7bdf86e..279359702 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -403,9 +403,7 @@ encode_enc_key(const hs_desc_intro_point_t *ip) tor_assert(ip); /* Base64 encode the encryption key for the "enc-key" field. */ - if (curve25519_public_to_base64(key_b64, &ip->enc_key) < 0) { - goto done; - } + curve25519_public_to_base64(key_b64, &ip->enc_key); if (tor_cert_encode_ed22519(ip->enc_key_cert, &encoded_cert) < 0) { goto done; } @@ -421,7 +419,7 @@ encode_enc_key(const hs_desc_intro_point_t *ip) } /* Encode an introduction point onion key. Return a newly allocated string - * with it. On failure, return NULL. */ + * with it. Can not fail. */ static char * encode_onion_key(const hs_desc_intro_point_t *ip) { @@ -431,12 +429,9 @@ encode_onion_key(const hs_desc_intro_point_t *ip) tor_assert(ip); /* Base64 encode the encryption key for the "onion-key" field. */ - if (curve25519_public_to_base64(key_b64, &ip->onion_key) < 0) { - goto done; - } + curve25519_public_to_base64(key_b64, &ip->onion_key); tor_asprintf(&encoded, "%s ntor %s", str_ip_onion_key, key_b64); - done: return encoded; } @@ -797,8 +792,8 @@ get_inner_encrypted_layer_plaintext(const hs_descriptor_t *desc) /* Create the middle layer of the descriptor, which includes the client auth * data and the encrypted inner layer (provided as a base64 string at * layer2_b64_ciphertext). Return a newly-allocated string with the - * layer plaintext, or NULL if an error occurred. It's the responsibility of - * the caller to free the returned string. */ + * layer plaintext. It's the responsibility of the caller to free the returned + * string. Can not fail. */ static char * get_outer_encrypted_layer_plaintext(const hs_descriptor_t *desc, const char *layer2_b64_ciphertext) @@ -817,10 +812,7 @@ get_outer_encrypted_layer_plaintext(const hs_descriptor_t *desc, tor_assert(!tor_mem_is_zero((char *) ephemeral_pubkey->public_key, CURVE25519_PUBKEY_LEN)); - if (curve25519_public_to_base64(ephemeral_key_base64, - ephemeral_pubkey) < 0) { - goto done; - } + curve25519_public_to_base64(ephemeral_key_base64, ephemeral_pubkey); smartlist_add_asprintf(lines, "%s %s\n", str_desc_auth_key, ephemeral_key_base64); @@ -845,7 +837,6 @@ get_outer_encrypted_layer_plaintext(const hs_descriptor_t *desc, layer1_str = smartlist_join_strings(lines, "", 0, NULL); - done: /* We need to memwipe all lines because it contains the ephemeral key */ SMARTLIST_FOREACH(lines, char *, a, memwipe(a, 0, strlen(a))); SMARTLIST_FOREACH(lines, char *, a, tor_free(a)); diff --git a/src/lib/crypt_ops/crypto_curve25519.h b/src/lib/crypt_ops/crypto_curve25519.h index 061a7a350..cd23169cd 100644 --- a/src/lib/crypt_ops/crypto_curve25519.h +++ b/src/lib/crypt_ops/crypto_curve25519.h @@ -76,8 +76,8 @@ STATIC int curve25519_basepoint_impl(uint8_t *output, const uint8_t *secret); int curve25519_public_from_base64(curve25519_public_key_t *pkey, const char *input); -int curve25519_public_to_base64(char *output, - const curve25519_public_key_t *pkey); +void curve25519_public_to_base64(char *output, + const curve25519_public_key_t *pkey); void curve25519_set_impl_params(int use_ed); void curve25519_init(void); diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 217ac8959..800f4ad5b 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -131,20 +131,27 @@ crypto_read_tagged_contents_from_file(const char *fname, return r; } -/** Encode pkey as a base64-encoded string, without trailing "=" +/** Encode pkey as a base64-encoded string, including trailing "=" * characters, in the buffer output, which must have at least - * CURVE25519_BASE64_PADDED_LEN+1 bytes available. Return 0 on success, -1 on - * failure. */ -int + * CURVE25519_BASE64_PADDED_LEN+1 bytes available. + * Can not fail. + * + * Careful! CURVE25519_BASE64_PADDED_LEN is one byte longer than + * ED25519_BASE64_LEN. + */ +void curve25519_public_to_base64(char *output, const curve25519_public_key_t *pkey) { char buf[128]; - base64_encode(buf, sizeof(buf), - (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN, 0); - buf[CURVE25519_BASE64_PADDED_LEN] = '\0'; + int n = base64_encode(buf, sizeof(buf), + (const char*)pkey->public_key, + CURVE25519_PUBKEY_LEN, 0); + /* These asserts should always succeed, unless there is a bug in + * base64_encode(). */ + tor_assert(n == CURVE25519_BASE64_PADDED_LEN); + tor_assert(buf[CURVE25519_BASE64_PADDED_LEN] == '\0'); memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1); - return 0; } /** Try to decode a base64-encoded curve25519 public key from input diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index fb8046fd2..5f53ba688 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2075,7 +2075,7 @@ test_crypto_curve25519_encode(void *arg) curve25519_secret_key_generate(&seckey, 0); curve25519_public_key_generate(&key1, &seckey); - tt_int_op(0, OP_EQ, curve25519_public_to_base64(buf, &key1)); + curve25519_public_to_base64(buf, &key1); tt_int_op(CURVE25519_BASE64_PADDED_LEN, OP_EQ, strlen(buf)); tt_int_op(0, OP_EQ, curve25519_public_from_base64(&key2, buf));

1 0

[tor/master] doc: Improve the monotonic time module and function documentation
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit e52d725977ffc7d47992375772b5936d36bb9d7d Author: teor <teor(a)torproject.org> Date: Mon Mar 4 11:21:15 2019 +1000 doc: Improve the monotonic time module and function documentation Explain what "monotonic" actually means, and document some results that have surprised people. Fixes bug 29640; bugfix on 0.2.9.1-alpha. --- changes/bug29640 | 4 ++++ src/lib/time/compat_time.c | 10 +++++++++- src/lib/time/compat_time.h | 50 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/changes/bug29640 b/changes/bug29640 new file mode 100644 index 000000000..81adeae32 --- /dev/null +++ b/changes/bug29640 @@ -0,0 +1,4 @@ + o Minor bugfixes (documentation): + - Improve the monotonic time module and function documentation. Explain + what "monotonic" actually means, and document some results that have + surprised people. Fixes bug 29640; bugfix on 0.2.9.1-alpha. diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 33e077a58..94823b8a0 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -164,6 +164,8 @@ static int64_t last_tick_count = 0; * to be monotonic; increments them as appropriate so that they actually * _are_ monotonic. * + * The returned time may be the same as the previous returned time. + * * Caller must hold lock. */ STATIC int64_t ratchet_performance_counter(int64_t count_raw) @@ -202,6 +204,8 @@ static struct timeval timeofday_offset = { 0, 0 }; * supposed to be monotonic; increments them as appropriate so that they * actually _are_ monotonic. * + * The returned time may be the same as the previous returned time. + * * Caller must hold lock. */ STATIC void ratchet_timeval(const struct timeval *timeval_raw, struct timeval *out) @@ -270,7 +274,9 @@ monotime_init_internal(void) } /** - * Set "out" to the most recent monotonic time value + * Set "out" to the most recent monotonic time value. + * + * The returned time may be the same as the previous returned time. */ void monotime_get(monotime_t *out) @@ -302,6 +308,8 @@ monotime_coarse_get(monotime_coarse_t *out) /** * Return the number of nanoseconds between start and end. + * + * The returned value may be equal to zero. */ int64_t monotime_diff_nsec(const monotime_t *start, diff --git a/src/lib/time/compat_time.h b/src/lib/time/compat_time.h index 2cd4b3bee..360d92e5c 100644 --- a/src/lib/time/compat_time.h +++ b/src/lib/time/compat_time.h @@ -15,11 +15,29 @@ * of tens of milliseconds. */ -/* Q: Should you use monotime or monotime_coarse as your source? +/* Q: When should I use monotonic time? + * + * A: If you need a time that never decreases, use monotonic time. If you need + * to send a time to a user or another process, or store a time, use the + * wall-clock time. + * + * Q: Should you use monotime or monotime_coarse as your source? * * A: Generally, you get better precision with monotime, but better * performance with monotime_coarse. * + * Q: What is a "monotonic" time, exactly? + * + * A: Monotonic times are strictly non-decreasing. The difference between any + * previous monotonic time, and the current monotonic time, is always greater + * than *or equal to* zero. + * Zero deltas happen more often: + * - on Windows (due to an OS bug), + * - when using monotime_coarse, or on systems with low-resolution timers, + * - on platforms where we emulate monotonic time using wall-clock time, and + * - when using time units that are larger than nanoseconds (due to + * truncation on division). + * * Q: Should you use monotime_t or monotime_coarse_t directly? Should you use * usec? msec? "stamp units?" * @@ -95,7 +113,7 @@ * All, "timestamp units": Cheap everywhere: it never divides. * * Q: This is only somewhat related, but how much precision could I hope for - * from a libevent time.? + * from a libevent time? * * A: Actually, it's _very_ related if you're timing in order to have a * timeout happen. @@ -182,26 +200,36 @@ void monotime_init(void); void monotime_get(monotime_t *out); /** * Return the number of nanoseconds between start and end. + * The returned value may be equal to zero. */ int64_t monotime_diff_nsec(const monotime_t *start, const monotime_t *end); /** * Return the number of microseconds between start and end. + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ int64_t monotime_diff_usec(const monotime_t *start, const monotime_t *end); /** * Return the number of milliseconds between start and end. + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ int64_t monotime_diff_msec(const monotime_t *start, const monotime_t *end); /** * Return the number of nanoseconds since the timer system was initialized. + * The returned value may be equal to zero. */ uint64_t monotime_absolute_nsec(void); /** * Return the number of microseconds since the timer system was initialized. + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ MOCK_DECL(uint64_t, monotime_absolute_usec,(void)); /** * Return the number of milliseconds since the timer system was initialized. + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ uint64_t monotime_absolute_msec(void); @@ -225,6 +253,9 @@ void monotime_add_msec(monotime_t *out, const monotime_t *val, uint32_t msec); * Set out to the current coarse time. */ void monotime_coarse_get(monotime_coarse_t *out); +/** + * Like monotime_absolute_*(), but faster on some platforms. + */ uint64_t monotime_coarse_absolute_nsec(void); uint64_t monotime_coarse_absolute_usec(void); uint64_t monotime_coarse_absolute_msec(void); @@ -248,18 +279,27 @@ uint32_t monotime_coarse_to_stamp(const monotime_coarse_t *t); /** * Convert a difference, expressed in the units of monotime_coarse_to_stamp, * into an approximate number of milliseconds. + * + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ uint64_t monotime_coarse_stamp_units_to_approx_msec(uint64_t units); uint64_t monotime_msec_to_approx_coarse_stamp_units(uint64_t msec); uint32_t monotime_coarse_get_stamp(void); #if defined(MONOTIME_COARSE_TYPE_IS_DIFFERENT) +/** + * Like monotime_diff_*(), but faster on some platforms. + */ int64_t monotime_coarse_diff_nsec(const monotime_coarse_t *start, const monotime_coarse_t *end); int64_t monotime_coarse_diff_usec(const monotime_coarse_t *start, const monotime_coarse_t *end); int64_t monotime_coarse_diff_msec(const monotime_coarse_t *start, const monotime_coarse_t *end); +/** + * Like monotime_*(), but faster on some platforms. + */ void monotime_coarse_zero(monotime_coarse_t *out); int monotime_coarse_is_zero(const monotime_coarse_t *val); void monotime_coarse_add_msec(monotime_coarse_t *out, @@ -278,6 +318,9 @@ void monotime_coarse_add_msec(monotime_coarse_t *out, * * Requires that the difference fit into an int32_t; not for use with * large time differences. + * + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ int32_t monotime_coarse_diff_msec32_(const monotime_coarse_t *start, const monotime_coarse_t *end); @@ -287,6 +330,9 @@ int32_t monotime_coarse_diff_msec32_(const monotime_coarse_t *start, * * Requires that the difference fit into an int32_t; not for use with * large time differences. + * + * The returned value may be equal to zero. + * Fractional units are truncated, not rounded. */ static inline int32_t monotime_coarse_diff_msec32(const monotime_coarse_t *start,

1 0

[tor/master] crypto_format: Remove the return values from digest256_to_base64()
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit 7d513a5d5541d17c4e9622a9af76303042fd380b Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:02:43 2019 +1000 crypto_format: Remove the return values from digest256_to_base64() ... and ed25519_public_to_base64(). Also remove all checks for the return values, which were redundant anyway, because the functions never failed. Part of 29960. --- src/feature/dirauth/dirvote.c | 3 +-- src/feature/hs/hs_client.c | 16 +++------------- src/feature/hs/hs_control.c | 23 +++++------------------ src/feature/relay/router.c | 7 ++----- src/lib/crypt_ops/crypto_format.c | 27 +++++++++++++++++---------- src/lib/crypt_ops/crypto_format.h | 6 +++--- src/test/test_crypto.c | 2 +- src/test/test_dir.c | 4 +--- src/test/test_hs_cache.c | 4 +--- src/test/test_hs_control.c | 3 +-- 10 files changed, 35 insertions(+), 60 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 29f5d0450..1f861d241 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -3914,8 +3914,7 @@ dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len, ","); tor_assert(microdesc_consensus_methods); - if (digest256_to_base64(d64, md->digest)<0) - goto out; + digest256_to_base64(d64, md->digest); if (tor_snprintf(out_buf, out_buf_len, "m %s sha256=%s\n", microdesc_consensus_methods, d64)<0) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index c34271efc..38b9646c1 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -165,9 +165,7 @@ purge_hid_serv_request(const ed25519_public_key_t *identity_pk) * some point and we don't care about those anymore. */ hs_build_blinded_pubkey(identity_pk, NULL, 0, hs_get_time_period_num(0), &blinded_pk); - if (BUG(ed25519_public_to_base64(base64_blinded_pk, &blinded_pk) < 0)) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, &blinded_pk); /* Purge last hidden service request from cache for this blinded key. */ hs_purge_hid_serv_from_last_hid_serv_requests(base64_blinded_pk); } @@ -354,7 +352,6 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, ed25519_public_key_t blinded_pubkey; char base64_blinded_pubkey[ED25519_BASE64_LEN + 1]; hs_ident_dir_conn_t hs_conn_dir_ident; - int retval; tor_assert(hsdir); tor_assert(onion_identity_pk); @@ -363,10 +360,7 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, hs_build_blinded_pubkey(onion_identity_pk, NULL, 0, current_time_period, &blinded_pubkey); /* ...and base64 it. */ - retval = ed25519_public_to_base64(base64_blinded_pubkey, &blinded_pubkey); - if (BUG(retval < 0)) { - return HS_CLIENT_FETCH_ERROR; - } + ed25519_public_to_base64(base64_blinded_pubkey, &blinded_pubkey); /* Copy onion pk to a dir_ident so that we attach it to the dir conn */ hs_ident_dir_conn_init(onion_identity_pk, &blinded_pubkey, @@ -405,7 +399,6 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, STATIC routerstatus_t * pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) { - int retval; char base64_blinded_pubkey[ED25519_BASE64_LEN + 1]; uint64_t current_time_period = hs_get_time_period_num(0); smartlist_t *responsible_hsdirs = NULL; @@ -418,10 +411,7 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) hs_build_blinded_pubkey(onion_identity_pk, NULL, 0, current_time_period, &blinded_pubkey); /* ...and base64 it. */ - retval = ed25519_public_to_base64(base64_blinded_pubkey, &blinded_pubkey); - if (BUG(retval < 0)) { - return NULL; - } + ed25519_public_to_base64(base64_blinded_pubkey, &blinded_pubkey); /* Get responsible hsdirs of service for this time period */ responsible_hsdirs = smartlist_new(); diff --git a/src/feature/hs/hs_control.c b/src/feature/hs/hs_control.c index 20a106160..abb421345 100644 --- a/src/feature/hs/hs_control.c +++ b/src/feature/hs/hs_control.c @@ -74,10 +74,7 @@ hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, tor_assert(reason); /* Build onion address and encoded blinded key. */ - IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, - &ident->blinded_pk) < 0) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, &ident->blinded_pk); hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); control_event_hsv3_descriptor_failed(onion_address, base64_blinded_pk, @@ -99,10 +96,7 @@ hs_control_desc_event_received(const hs_ident_dir_conn_t *ident, tor_assert(hsdir_id_digest); /* Build onion address and encoded blinded key. */ - IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, - &ident->blinded_pk) < 0) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, &ident->blinded_pk); hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); control_event_hsv3_descriptor_received(onion_address, base64_blinded_pk, @@ -123,9 +117,7 @@ hs_control_desc_event_created(const char *onion_address, tor_assert(blinded_pk); /* Build base64 encoded blinded key. */ - IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, blinded_pk) < 0) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, blinded_pk); /* Version 3 doesn't use the replica number in its descriptor ID computation * so we pass negative value so the control port subsystem can ignore it. */ @@ -151,9 +143,7 @@ hs_control_desc_event_upload(const char *onion_address, tor_assert(hsdir_index); /* Build base64 encoded blinded key. */ - IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, blinded_pk) < 0) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, blinded_pk); control_event_hs_descriptor_upload(onion_address, hsdir_id_digest, base64_blinded_pk, @@ -196,10 +186,7 @@ hs_control_desc_event_content(const hs_ident_dir_conn_t *ident, tor_assert(hsdir_id_digest); /* Build onion address and encoded blinded key. */ - IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, - &ident->blinded_pk) < 0) { - return; - } + ed25519_public_to_base64(base64_blinded_pk, &ident->blinded_pk); hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); control_event_hs_descriptor_content(onion_address, base64_blinded_pk, diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index e5cf72ad1..837465cfe 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2728,11 +2728,8 @@ router_dump_router_to_string(routerinfo_t *router, log_err(LD_BUG,"Couldn't base64-encode signing key certificate!"); goto err; } - if (ed25519_public_to_base64(ed_fp_base64, - &router->cache_info.signing_key_cert->signing_key)<0) { - log_err(LD_BUG,"Couldn't base64-encode identity key\n"); - goto err; - } + ed25519_public_to_base64(ed_fp_base64, + &router->cache_info.signing_key_cert->signing_key); tor_asprintf(&ed_cert_line, "identity-ed25519\n" "-----BEGIN ED25519 CERT-----\n" "%s" diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 1467b3d0a..217ac8959 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -181,8 +181,7 @@ ed25519_fmt(const ed25519_public_key_t *pkey) if (ed25519_public_key_is_zero(pkey)) { strlcpy(formatted, "<unset>", sizeof(formatted)); } else { - int r = ed25519_public_to_base64(formatted, pkey); - tor_assert(!r); + ed25519_public_to_base64(formatted, pkey); } } else { strlcpy(formatted, "<null>", sizeof(formatted)); @@ -202,13 +201,17 @@ ed25519_public_from_base64(ed25519_public_key_t *pkey, /** Encode the public key pkey into the buffer at output, * which must have space for ED25519_BASE64_LEN bytes of encoded key, - * plus one byte for a terminating NUL. Return 0 on success, -1 on failure. + * plus one byte for a terminating NUL. + * Can not fail. + * + * Careful! ED25519_BASE64_LEN is one byte shorter than + * CURVE25519_BASE64_PADDED_LEN. */ -int +void ed25519_public_to_base64(char *output, const ed25519_public_key_t *pkey) { - return digest256_to_base64(output, (const char *)pkey->pubkey); + digest256_to_base64(output, (const char *)pkey->pubkey); } /** Encode the signature sig into the buffer at output, @@ -281,15 +284,19 @@ digest_from_base64(char *digest, const char *d64) /** Base64 encode DIGEST256_LINE bytes from digest, remove the * trailing = characters, and store the nul-terminated result in the first - * BASE64_DIGEST256_LEN+1 bytes of d64. */ -int + * BASE64_DIGEST256_LEN+1 bytes of d64. + * Can not fail. */ +void digest256_to_base64(char *d64, const char *digest) { char buf[256]; - base64_encode(buf, sizeof(buf), digest, DIGEST256_LEN, 0); - buf[BASE64_DIGEST256_LEN] = '\0'; + int n = base64_encode_nopad(buf, sizeof(buf), + (const uint8_t *)digest, DIGEST256_LEN); + /* These asserts should always succeed, unless there is a bug in + * base64_encode_nopad(). */ + tor_assert(n == BASE64_DIGEST256_LEN); + tor_assert(buf[BASE64_DIGEST256_LEN] == '\0'); memcpy(d64, buf, BASE64_DIGEST256_LEN+1); - return 0; } /** Given a base64 encoded, nul-terminated digest in d64 (without diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index 53238cb5a..41c2b06ec 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -33,8 +33,8 @@ ssize_t crypto_read_tagged_contents_from_file(const char *fname, int ed25519_public_from_base64(struct ed25519_public_key_t *pkey, const char *input); -int ed25519_public_to_base64(char *output, - const struct ed25519_public_key_t *pkey); +void ed25519_public_to_base64(char *output, + const struct ed25519_public_key_t *pkey); const char *ed25519_fmt(const struct ed25519_public_key_t *pkey); int ed25519_signature_from_base64(struct ed25519_signature_t *sig, @@ -44,7 +44,7 @@ int ed25519_signature_to_base64(char *output, void digest_to_base64(char *d64, const char *digest); int digest_from_base64(char *digest, const char *d64); -int digest256_to_base64(char *d64, const char *digest); +void digest256_to_base64(char *d64, const char *digest); int digest256_from_base64(char *digest, const char *d64); #endif /* !defined(TOR_CRYPTO_FORMAT_H) */ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index a5c17b3e6..fb8046fd2 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2455,7 +2455,7 @@ test_crypto_ed25519_encode(void *arg) /* Test roundtrip. */ tt_int_op(0, OP_EQ, ed25519_keypair_generate(&kp, 0)); - tt_int_op(0, OP_EQ, ed25519_public_to_base64(buf, &kp.pubkey)); + ed25519_public_to_base64(buf, &kp.pubkey); tt_int_op(ED25519_BASE64_LEN, OP_EQ, strlen(buf)); tt_int_op(0, OP_EQ, ed25519_public_from_base64(&pk, buf)); tt_mem_op(kp.pubkey.pubkey, OP_EQ, pk.pubkey, ED25519_PUBKEY_LEN); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6518977b6..17d6db1e4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -995,9 +995,7 @@ test_dir_formats_rsa_ed25519(void *arg) smartlist_add_strdup(chunks, "master-key-ed25519 "); { char k[ED25519_BASE64_LEN+1]; - tt_int_op(ed25519_public_to_base64(k, - &r2->cache_info.signing_key_cert->signing_key), - OP_GE, 0); + ed25519_public_to_base64(k, &r2->cache_info.signing_key_cert->signing_key); smartlist_add_strdup(chunks, k); smartlist_add_strdup(chunks, "\n"); } diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 918282911..48e8d3b8c 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -238,9 +238,7 @@ helper_fetch_desc_from_hsdir(const ed25519_public_key_t *blinded_key) { char hsdir_cache_key[ED25519_BASE64_LEN+1]; - retval = ed25519_public_to_base64(hsdir_cache_key, - blinded_key); - tt_int_op(retval, OP_EQ, 0); + ed25519_public_to_base64(hsdir_cache_key, blinded_key); tor_asprintf(&hsdir_query_str, GET("/tor/hs/3/%s"), hsdir_cache_key); } diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index 481ef1eb3..7cedc987b 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -107,8 +107,7 @@ test_hs_desc_event(void *arg) memset(&blinded_pk, 'B', sizeof(blinded_pk)); memset(&hsdir_rs, 0, sizeof(hsdir_rs)); memcpy(hsdir_rs.identity_digest, HSDIR_EXIST_ID, DIGEST_LEN); - ret = ed25519_public_to_base64(base64_blinded_pk, &blinded_pk); - tt_int_op(ret, OP_EQ, 0); + ed25519_public_to_base64(base64_blinded_pk, &blinded_pk); memcpy(&ident.identity_pk, &identity_kp.pubkey, sizeof(ed25519_public_key_t)); memcpy(&ident.blinded_pk, &blinded_pk, sizeof(blinded_pk));

1 0

[tor/master] crypto_format: Remove unused return value from digest_to_base64()
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit abaed046a6f0f6f6fea5eaf3631b10a514e962e9 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 14:58:20 2019 +1000 crypto_format: Remove unused return value from digest_to_base64() Part of 29660. --- src/lib/crypt_ops/crypto_format.c | 16 ++++++++++------ src/lib/crypt_ops/crypto_format.h | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index f37ec1046..1467b3d0a 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -250,17 +250,21 @@ ed25519_signature_from_base64(ed25519_signature_t *sig, return 0; } -/** Base64 encode DIGEST_LINE bytes from digest, remove the trailing = +/** Base64 encode DIGEST_LEN bytes from digest, remove the trailing = * characters, and store the nul-terminated result in the first - * BASE64_DIGEST_LEN+1 bytes of d64. */ -int + * BASE64_DIGEST_LEN+1 bytes of d64. + * Can not fail. */ +void digest_to_base64(char *d64, const char *digest) { char buf[256]; - base64_encode(buf, sizeof(buf), digest, DIGEST_LEN, 0); - buf[BASE64_DIGEST_LEN] = '\0'; + int n = base64_encode_nopad(buf, sizeof(buf), + (const uint8_t *)digest, DIGEST_LEN); + /* These asserts should always succeed, unless there is a bug in + * base64_encode_nopad(). */ + tor_assert(n == BASE64_DIGEST_LEN); + tor_assert(buf[BASE64_DIGEST_LEN] == '\0'); memcpy(d64, buf, BASE64_DIGEST_LEN+1); - return 0; } /** Given a base64 encoded, nul-terminated digest in d64 (without diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index fe852e6a6..53238cb5a 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -42,7 +42,7 @@ int ed25519_signature_from_base64(struct ed25519_signature_t *sig, int ed25519_signature_to_base64(char *output, const struct ed25519_signature_t *sig); -int digest_to_base64(char *d64, const char *digest); +void digest_to_base64(char *d64, const char *digest); int digest_from_base64(char *digest, const char *d64); int digest256_to_base64(char *d64, const char *digest); int digest256_from_base64(char *digest, const char *d64);

1 0