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

[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

[tor/master] crypto_format: Stop adding padding in ed25519_signature_from_base64()
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit 5e2cba8eb4b80990fa63626054d070ad77578028 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:10:00 2019 +1000 crypto_format: Stop adding padding in ed25519_signature_from_base64() base64_decode() does not require padding. Part of 29660. --- src/lib/crypt_ops/crypto_format.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 269e6d9da..1827168c7 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -246,14 +246,11 @@ int ed25519_signature_from_base64(ed25519_signature_t *sig, const char *input) { - if (strlen(input) != ED25519_SIG_BASE64_LEN) return -1; - char buf[ED25519_SIG_BASE64_LEN+3]; + char buf[ED25519_SIG_BASE64_LEN+1]; memcpy(buf, input, ED25519_SIG_BASE64_LEN); - buf[ED25519_SIG_BASE64_LEN+0] = '='; - buf[ED25519_SIG_BASE64_LEN+1] = '='; - buf[ED25519_SIG_BASE64_LEN+2] = 0; + buf[ED25519_SIG_BASE64_LEN] = 0; char decoded[128]; int n = base64_decode(decoded, sizeof(decoded), buf, strlen(buf)); if (n < 0 || n != ED25519_SIG_LEN)

1 0

[tor/master] binascii: Fix the base64_encode_nopad() buffer length requirement
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit c616f457762117cbcbb982a0224d9f8eb2cd9419 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:10:36 2019 +1000 binascii: Fix the base64_encode_nopad() buffer length requirement Comment-only change. Part of 29660. --- src/lib/encoding/binascii.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c index 187df3424..fc64e014e 100644 --- a/src/lib/encoding/binascii.c +++ b/src/lib/encoding/binascii.c @@ -321,8 +321,10 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, return (int) enclen; } -/** As base64_encode, but do not add any internal spaces or external padding - * to the output stream. */ +/** As base64_encode, but do not add any internal spaces, and remove external + * padding from the output stream. + * dest must be at least base64_encode_size(srclen, 0), including space for + * the removed external padding. */ int base64_encode_nopad(char *dest, size_t destlen, const uint8_t *src, size_t srclen)

1 0

[tor/master] changes: file for 29660
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit ac269d5c30d09194b6ab80232f72bfbd6fa69ed2 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:16:49 2019 +1000 changes: file for 29660 --- changes/ticket29660 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket29660 b/changes/ticket29660 new file mode 100644 index 000000000..84b805910 --- /dev/null +++ b/changes/ticket29660 @@ -0,0 +1,5 @@ + o Code simplification and refactoring: + - Remove redundant return values in crypto_format, and the associated + return value checks elsewhere in the code. Make the implementations in + crypto_format consistent, and remove redundant code. + Resolves ticket 29660.

1 0

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

12 Apr '19

commit ce5e38642d1f5e48a7e5c98422e0fa23145f0363 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 15:08:54 2019 +1000 crypto_format: Remove the return value from ed25519_signature_to_base64() 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 | 6 +----- src/feature/relay/router.c | 6 ++---- src/lib/crypt_ops/crypto_format.c | 9 ++++++--- src/lib/crypt_ops/crypto_format.h | 4 ++-- src/test/test_crypto.c | 2 +- src/test/test_hs_descriptor.c | 3 +-- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 279359702..b526da666 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -1082,11 +1082,7 @@ desc_encode_v3(const hs_descriptor_t *desc, tor_free(encoded_str); goto err; } - if (ed25519_signature_to_base64(ed_sig_b64, &sig) < 0) { - log_warn(LD_BUG, "Can't base64 encode descriptor signature!"); - tor_free(encoded_str); - goto err; - } + ed25519_signature_to_base64(ed_sig_b64, &sig); /* Create the signature line. */ smartlist_add_asprintf(lines, "%s %s", str_signature, ed_sig_b64); } diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 837465cfe..ac4b3b7a0 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2974,8 +2974,7 @@ router_dump_router_to_string(routerinfo_t *router, if (ed25519_sign(&sig, (const uint8_t*)digest, DIGEST256_LEN, signing_keypair) < 0) goto err; - if (ed25519_signature_to_base64(buf, &sig) < 0) - goto err; + ed25519_signature_to_base64(buf, &sig); smartlist_add_asprintf(chunks, "%s\n", buf); } @@ -3249,8 +3248,7 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, if (ed25519_sign(&ed_sig, (const uint8_t*)sha256_digest, DIGEST256_LEN, signing_keypair) < 0) goto err; - if (ed25519_signature_to_base64(buf, &ed_sig) < 0) - goto err; + ed25519_signature_to_base64(buf, &ed_sig); smartlist_add_asprintf(chunks, "%s\n", buf); } diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 800f4ad5b..269e6d9da 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -223,17 +223,20 @@ ed25519_public_to_base64(char *output, /** Encode the signature sig into the buffer at output, * which must have space for ED25519_SIG_BASE64_LEN bytes of encoded signature, - * plus one byte for a terminating NUL. Return 0 on success, -1 on failure. + * plus one byte for a terminating NUL. + * Can not fail. */ -int +void ed25519_signature_to_base64(char *output, const ed25519_signature_t *sig) { char buf[256]; int n = base64_encode_nopad(buf, sizeof(buf), sig->sig, ED25519_SIG_LEN); + /* These asserts should always succeed, unless there is a bug in + * base64_encode_nopad(). */ tor_assert(n == ED25519_SIG_BASE64_LEN); + tor_assert(buf[ED25519_SIG_BASE64_LEN] == '\0'); memcpy(output, buf, ED25519_SIG_BASE64_LEN+1); - return 0; } /** Try to decode the string input into an ed25519 signature. On diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index 41c2b06ec..b4b3aa189 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -39,8 +39,8 @@ const char *ed25519_fmt(const struct ed25519_public_key_t *pkey); int ed25519_signature_from_base64(struct ed25519_signature_t *sig, const char *input); -int ed25519_signature_to_base64(char *output, - const struct ed25519_signature_t *sig); +void ed25519_signature_to_base64(char *output, + const struct ed25519_signature_t *sig); void digest_to_base64(char *d64, const char *digest); int digest_from_base64(char *digest, const char *d64); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 5f53ba688..08dfb6bcd 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2461,7 +2461,7 @@ test_crypto_ed25519_encode(void *arg) tt_mem_op(kp.pubkey.pubkey, OP_EQ, pk.pubkey, ED25519_PUBKEY_LEN); tt_int_op(0, OP_EQ, ed25519_sign(&sig1, (const uint8_t*)"ABC", 3, &kp)); - tt_int_op(0, OP_EQ, ed25519_signature_to_base64(buf, &sig1)); + ed25519_signature_to_base64(buf, &sig1); tt_int_op(0, OP_EQ, ed25519_signature_from_base64(&sig2, buf)); tt_mem_op(sig1.sig, OP_EQ, sig2.sig, ED25519_SIG_LEN); diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 09c6c3e70..86965d7d6 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -739,8 +739,7 @@ test_desc_signature(void *arg) ret = ed25519_sign_prefixed(&sig, (const uint8_t *) data, strlen(data), "Tor onion service descriptor sig v3", &kp); tt_int_op(ret, OP_EQ, 0); - ret = ed25519_signature_to_base64(sig_b64, &sig); - tt_int_op(ret, OP_EQ, 0); + ed25519_signature_to_base64(sig_b64, &sig); /* Build the descriptor that should be valid. */ tor_asprintf(&desc, "%ssignature %s\n", data, sig_b64); ret = desc_sig_is_valid(sig_b64, &kp.pubkey, desc, strlen(desc));

1 0

[tor/master] Merge branch 'tor-github/pr/754'
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit 86aa1415729e064883cac988bccb6c4935fbb8d2 Merge: adeecce53 e52d72597 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 12 13:45:53 2019 +0300 Merge branch 'tor-github/pr/754' changes/bug29640 | 4 ++++ src/lib/time/compat_time.c | 10 +++++++++- src/lib/time/compat_time.h | 50 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/908'
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit 7b386f2356c9c706e9432b19058dee8147030056 Merge: 86aa14157 ebbc2c3d8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 12 13:47:08 2019 +0300 Merge branch 'tor-github/pr/908' changes/ticket29660 | 5 ++ src/feature/dirauth/dirvote.c | 3 +- src/feature/hs/hs_client.c | 16 ++----- src/feature/hs/hs_control.c | 23 ++------- src/feature/hs/hs_descriptor.c | 27 +++-------- src/feature/relay/router.c | 13 ++---- src/lib/crypt_ops/crypto_curve25519.h | 4 +- src/lib/crypt_ops/crypto_format.c | 88 ++++++++++++++++++++--------------- src/lib/crypt_ops/crypto_format.h | 12 ++--- src/lib/encoding/binascii.c | 6 ++- src/test/test_crypto.c | 6 +-- src/test/test_dir.c | 4 +- src/test/test_hs_cache.c | 4 +- src/test/test_hs_control.c | 3 +- src/test/test_hs_descriptor.c | 3 +- 15 files changed, 94 insertions(+), 123 deletions(-)

1 0

[tor/master] crypt_ops: Stop using a separate buffer in ed25519_signature_from_base64()
by asn＠torproject.org 12 Apr '19

12 Apr '19

commit ebbc2c3d8f8268c09b6df8270907a1123f926caa Author: teor <teor(a)torproject.org> Date: Fri Apr 12 13:00:02 2019 +1000 crypt_ops: Stop using a separate buffer in ed25519_signature_from_base64() Part of 29960. --- src/lib/crypt_ops/crypto_format.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 1827168c7..e11b39119 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -248,11 +248,9 @@ ed25519_signature_from_base64(ed25519_signature_t *sig, { if (strlen(input) != ED25519_SIG_BASE64_LEN) return -1; - char buf[ED25519_SIG_BASE64_LEN+1]; - memcpy(buf, input, ED25519_SIG_BASE64_LEN); - buf[ED25519_SIG_BASE64_LEN] = 0; char decoded[128]; - int n = base64_decode(decoded, sizeof(decoded), buf, strlen(buf)); + int n = base64_decode(decoded, sizeof(decoded), input, + ED25519_SIG_BASE64_LEN); if (n < 0 || n != ED25519_SIG_LEN) return -1; memcpy(sig->sig, decoded, ED25519_SIG_LEN);

1 0

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

12 Apr '19

commit ea68a6f8f163c61852a72bcb650b6ab364934336 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 10:21:10 2019 +0000 Update translations for support-portal --- contents+ca.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contents+ca.po b/contents+ca.po index 3de7e1195..6c5be0919 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -139,6 +139,9 @@ msgid "" "Browser](https://www.torproject.org/download) and then using it to navigate " "to the blocked site will allow access." msgstr "" +"Normalment, descarregar el [Navegador " +"Tor](https://www.torproject.org/download) i utilitzar-lo per navegar per la " +"pàgina bloquejada permetrà accedir-la." #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -151,6 +154,9 @@ msgid "" "circumvention options available, including [pluggable transports](https" "://tb-manual.torproject.org/transports/)." msgstr "" +"En llocs on hi ha una gran censura, tenim disponibles diverses opcions " +"d’elusió contra la censura, incloent [transports connectables](https://tb-" +"manual.torproject.org/ca/transports/)" #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -6147,7 +6153,7 @@ msgstr "Subscriure's al nostre butlletí informatiu" #: templates/footer.html:25 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Obteniu actualitzacions i oportunitats mensuals del projecte Tor:" #: templates/footer.html:26 msgid "Sign up"

1 0

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

12 Apr '19

commit a8a46ac5c311785cca88a14f2f4c648e8ea6e553 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 12 10:20:48 2019 +0000 Update translations for tpo-web --- contents+ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 584588bfb..b5add5649 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1,8 +1,8 @@ # Translators: # Jaime Muñoz Martín <jmmartin_5(a)outlook.com>, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2019 -# Emma Peel, 2019 # erinm, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-06 10:26+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Emma Peel, 2019\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" @@ -675,7 +675,7 @@ msgstr "Subscriure's al nostre butlletí informatiu" #: templates/footer.html:49 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Obteniu actualitzacions i oportunitats mensuals del projecte Tor:" #: templates/footer.html:50 msgid "Sign up"

1 0