tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[tor/master] Use a custom Base64 encoder with more control over the output format.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 196499da73afa5c8000154aafe36c10b9ee43901 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Apr 10 11:25:08 2015 +0000 Use a custom Base64 encoder with more control over the output format. --- changes/feature15652 | 4 ++ src/common/crypto.c | 171 ++++++++++++++++++++++++++++++++++++++------ src/common/crypto.h | 5 +- src/common/crypto_format.c | 2 +- src/or/connection.c | 19 +---- src/or/dirvote.c | 5 +- src/or/rendclient.c | 7 +- src/or/rendcommon.c | 3 +- src/or/rendservice.c | 10 ++- src/or/router.c | 2 +- src/or/routerparse.c | 3 +- src/test/test_crypto.c | 36 +++++++++- src/tools/tor-gencert.c | 6 +- 13 files changed, 214 insertions(+), 59 deletions(-) diff --git a/changes/feature15652 b/changes/feature15652 index d11b76f..61d2b22 100644 --- a/changes/feature15652 +++ b/changes/feature15652 @@ -1,3 +1,7 @@ + o Code simplifications and refactoring: + - Use our own Base64 encoder instead of OpenSSL's, to allow more control + over the output. Part of ticket 15652. + o Removed code: - Remove `USE_OPENSSL_BASE64` and the corresponding fallback code and always use the internal Base64 decoder. The internal decoder has been diff --git a/src/common/crypto.c b/src/common/crypto.c index c7e015b..2cb1c39 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2426,36 +2426,161 @@ smartlist_shuffle(smartlist_t *sl) } } +#define BASE64_OPENSSL_LINELEN 64 + +/** Return the Base64 encoded size of srclen bytes of data in + * bytes. + * + * If flags&BASE64_ENCODE_MULTILINE is true, return the size + * of the encoded output as multiline output (64 character, `\n' terminated + * lines). + */ +size_t +base64_encode_size(size_t srclen, int flags) +{ + size_t enclen; + tor_assert(srclen < INT_MAX); + + if (srclen == 0) + return 0; + + enclen = ((srclen - 1) / 3) * 4 + 4; + if (flags & BASE64_ENCODE_MULTILINE) { + size_t remainder = enclen % BASE64_OPENSSL_LINELEN; + enclen += enclen / BASE64_OPENSSL_LINELEN; + if (remainder) + enclen++; + } + tor_assert(enclen < INT_MAX && enclen > srclen); + return enclen; +} + +/** Internal table mapping 6 bit values to the Base64 alphabet. */ +static const char base64_encode_table[64] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/' +}; + /** Base64 encode srclen bytes of data from src. Write * the result into dest, if it will fit within destlen - * bytes. Return the number of bytes written on success; -1 if + * bytes. Return the number of bytes written on success; -1 if * destlen is too short, or other failure. + * + * If flags&BASE64_ENCODE_MULTILINE is true, return encoded + * output in multiline format (64 character, `\n' terminated lines). */ int -base64_encode(char *dest, size_t destlen, const char *src, size_t srclen) -{ - /* FFFF we might want to rewrite this along the lines of base64_decode, if - * it ever shows up in the profile. */ - EVP_ENCODE_CTX ctx; - int len, ret; - tor_assert(srclen < INT_MAX); +base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, + int flags) +{ + const unsigned char *usrc = (unsigned char *)src; + const unsigned char *eous = usrc + srclen; + char *d = dest; + uint32_t n = 0; + size_t linelen = 0; + size_t enclen; + int n_idx = 0; + + if (!src || !dest) + return -1; - /* 48 bytes of input -> 64 bytes of output plus newline. - Plus one more byte, in case I'm wrong. - */ - if (destlen < ((srclen/48)+1)*66) + /* Ensure that there is sufficient space, including the NUL. */ + enclen = base64_encode_size(srclen, flags); + if (destlen < enclen + 1) return -1; if (destlen > SIZE_T_CEILING) return -1; - EVP_EncodeInit(&ctx); - EVP_EncodeUpdate(&ctx, (unsigned char*)dest, &len, - (unsigned char*)src, (int)srclen); - EVP_EncodeFinal(&ctx, (unsigned char*)(dest+len), &ret); - ret += len; - return ret; + memset(dest, 0, enclen); + + /* XXX/Yawning: If this ends up being too slow, this can be sped up + * by separating the multiline format case and the normal case, and + * processing 48 bytes of input at a time when newlines are desired. + */ +#define ENCODE_CHAR(ch) \ + STMT_BEGIN \ + *d++ = ch; \ + if (flags & BASE64_ENCODE_MULTILINE) { \ + if (++linelen % BASE64_OPENSSL_LINELEN == 0) { \ + linelen = 0; \ + *d++ = '\n'; \ + } \ + } \ + STMT_END + +#define ENCODE_N(idx) \ + ENCODE_CHAR(base64_encode_table[(n >> ((3 - idx) * 6)) & 0x3f]) + +#define ENCODE_PAD() ENCODE_CHAR('=') + + /* Iterate over all the bytes in src. Each one will add 8 bits to the + * value we're encoding. Accumulate bits in n, and whenever we + * have 24 bits, batch them into 4 bytes and flush those bytes to dest. + */ + for ( ; usrc < eous; ++usrc) { + n = (n << 8) | *usrc; + if ((++n_idx) == 3) { + ENCODE_N(0); + ENCODE_N(1); + ENCODE_N(2); + ENCODE_N(3); + n_idx = 0; + n = 0; + } + } + switch (n_idx) { + case 0: + /* 0 leftover bits, no pading to add. */ + break; + case 1: + /* 8 leftover bits, pad to 12 bits, write the 2 6-bit values followed + * by 2 padding characters. + */ + n <<= 4; + ENCODE_N(2); + ENCODE_N(3); + ENCODE_PAD(); + ENCODE_PAD(); + break; + case 2: + /* 16 leftover bits, pad to 18 bits, write the 3 6-bit values followed + * by 1 padding character. + */ + n <<= 2; + ENCODE_N(1); + ENCODE_N(2); + ENCODE_N(3); + ENCODE_PAD(); + break; + default: + /* Something went catastrophically wrong. */ + tor_fragile_assert(); + return -1; + } + +#undef ENCODE_N +#undef ENCODE_PAD +#undef ENCODE_CHAR + + /* Multiline output always includes at least one newline. */ + if (flags & BASE64_ENCODE_MULTILINE && linelen != 0) + *d++ = '\n'; + + tor_assert(d - dest == (ptrdiff_t)enclen); + + *d++ = '\0'; /* NUL terminate the output. */ + + return enclen; } +#undef BASE64_OPENSSL_LINELEN + /** @{ */ /** Special values used for the base64_decode_table */ #define X 255 @@ -2576,13 +2701,13 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) #undef PAD /** Base64 encode DIGEST_LINE bytes from digest, remove the trailing = - * and newline characters, and store the nul-terminated result in the first + * characters, and store the nul-terminated result in the first * BASE64_DIGEST_LEN+1 bytes of d64. */ int digest_to_base64(char *d64, const char *digest) { char buf[256]; - base64_encode(buf, sizeof(buf), digest, DIGEST_LEN); + base64_encode(buf, sizeof(buf), digest, DIGEST_LEN, 0); buf[BASE64_DIGEST_LEN] = '\0'; memcpy(d64, buf, BASE64_DIGEST_LEN+1); return 0; @@ -2601,13 +2726,13 @@ digest_from_base64(char *digest, const char *d64) } /** Base64 encode DIGEST256_LINE bytes from digest, remove the - * trailing = and newline characters, and store the nul-terminated result in - * the first BASE64_DIGEST256_LEN+1 bytes of d64. */ + * trailing = characters, and store the nul-terminated result in the first + * BASE64_DIGEST256_LEN+1 bytes of d64. */ int digest256_to_base64(char *d64, const char *digest) { char buf[256]; - base64_encode(buf, sizeof(buf), digest, DIGEST256_LEN); + base64_encode(buf, sizeof(buf), digest, DIGEST256_LEN, 0); buf[BASE64_DIGEST256_LEN] = '\0'; memcpy(d64, buf, BASE64_DIGEST256_LEN+1); return 0; diff --git a/src/common/crypto.h b/src/common/crypto.h index 440ff23..2061ec3 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -267,7 +267,10 @@ struct smartlist_t; void *smartlist_choose(const struct smartlist_t *sl); void smartlist_shuffle(struct smartlist_t *sl); -int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen); +#define BASE64_ENCODE_MULTILINE 1 +size_t base64_encode_size(size_t srclen, int flags); +int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, + int flags); int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen); /** Characters that can appear (case-insensitively) in a base32 encoding. */ #define BASE32_CHARS "abcdefghijklmnopqrstuvwxyz234567" diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c index 00e0e9e..35a7854 100644 --- a/src/common/crypto_format.c +++ b/src/common/crypto_format.c @@ -19,7 +19,7 @@ curve25519_public_to_base64(char *output, { char buf[128]; base64_encode(buf, sizeof(buf), - (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN); + (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN, 0); buf[CURVE25519_BASE64_PADDED_LEN] = '\0'; memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1); return 0; diff --git a/src/or/connection.c b/src/or/connection.c index 369df67..5610815 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4440,25 +4440,12 @@ alloc_http_authenticator(const char *authenticator) /* an authenticator in Basic authentication * is just the string "username:password" */ const size_t authenticator_length = strlen(authenticator); - /* The base64_encode function needs a minimum buffer length - * of 66 bytes. */ - const size_t base64_authenticator_length = (authenticator_length/48+1)*66; + const size_t base64_authenticator_length = + base64_encode_size(authenticator_length, 0) + 1; char *base64_authenticator = tor_malloc(base64_authenticator_length); if (base64_encode(base64_authenticator, base64_authenticator_length, - authenticator, authenticator_length) < 0) { + authenticator, authenticator_length, 0) < 0) { tor_free(base64_authenticator); /* free and set to null */ - } else { - int i = 0, j = 0; - ssize_t len = strlen(base64_authenticator); - - /* remove all newline occurrences within the string */ - for (i=0; i < len; ++i) { - if ('\n' != base64_authenticator[i]) { - base64_authenticator[j] = base64_authenticator[i]; - ++j; - } - } - base64_authenticator[j]='\0'; } return base64_authenticator; } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 7a5154d..3009026 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2244,7 +2244,8 @@ networkstatus_format_signatures(networkstatus_t *consensus, for_detached_signatures ? flavor_name : "", digest_name, id, sk); } - base64_encode(buf, sizeof(buf), sig->signature, sig->signature_len); + base64_encode(buf, sizeof(buf), sig->signature, sig->signature_len, + BASE64_ENCODE_MULTILINE); strlcat(buf, "-----END SIGNATURE-----\n", sizeof(buf)); smartlist_add(elements, tor_strdup(buf)); } SMARTLIST_FOREACH_END(sig); @@ -3459,7 +3460,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) char kbuf[128]; base64_encode(kbuf, sizeof(kbuf), (const char*)ri->onion_curve25519_pkey->public_key, - CURVE25519_PUBKEY_LEN); + CURVE25519_PUBKEY_LEN, BASE64_ENCODE_MULTILINE); smartlist_add_asprintf(chunks, "ntor-onion-key %s", kbuf); } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 162e0ac..de66b6d 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -685,12 +685,13 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) if (rend_query->auth_type != REND_NO_AUTH) { if (base64_encode(descriptor_cookie_base64, sizeof(descriptor_cookie_base64), - rend_query->descriptor_cookie, REND_DESC_COOKIE_LEN)<0) { + rend_query->descriptor_cookie, REND_DESC_COOKIE_LEN, + 0)<0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); return 0; } - /* Remove == signs and newline. */ - descriptor_cookie_base64[strlen(descriptor_cookie_base64)-3] = '\0'; + /* Remove == signs. */ + descriptor_cookie_base64[strlen(descriptor_cookie_base64)-2] = '\0'; } else { strlcpy(descriptor_cookie_base64, "(none)", sizeof(descriptor_cookie_base64)); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 5711f9e..435602f 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -529,7 +529,8 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, } /* Base64-encode introduction points. */ ipos_base64 = tor_calloc(ipos_len, 2); - if (base64_encode(ipos_base64, ipos_len * 2, ipos, ipos_len)<0) { + if (base64_encode(ipos_base64, ipos_len * 2, ipos, ipos_len, + BASE64_ENCODE_MULTILINE)<0) { log_warn(LD_REND, "Could not encode introduction point string to " "base64. length=%d", (int)ipos_len); tor_free(ipos_base64); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c1c0c46..0a41ed2 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -941,7 +941,7 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) } if (base64_encode(desc_cook_out, 3*REND_DESC_COOKIE_LEN_BASE64+1, client->descriptor_cookie, - REND_DESC_COOKIE_LEN) < 0) { + REND_DESC_COOKIE_LEN, 0) < 0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); goto err; } @@ -968,7 +968,6 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) client->client_key = prkey; } /* Add entry to client_keys file. */ - desc_cook_out[strlen(desc_cook_out)-1] = '\0'; /* Remove newline. */ written = tor_snprintf(buf, sizeof(buf), "client-name %s\ndescriptor-cookie %s\n", client->client_name, desc_cook_out); @@ -1023,12 +1022,11 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) ((int)s->auth_type - 1) << 4; if (base64_encode(desc_cook_out, 3*REND_DESC_COOKIE_LEN_BASE64+1, extended_desc_cookie, - REND_DESC_COOKIE_LEN+1) < 0) { + REND_DESC_COOKIE_LEN+1, 0) < 0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); goto err; } - desc_cook_out[strlen(desc_cook_out)-3] = '\0'; /* Remove A= and - newline. */ + desc_cook_out[strlen(desc_cook_out)-2] = '\0'; /* Remove A=. */ tor_snprintf(buf, sizeof(buf),"%s.onion %s # client: %s\n", service_id, desc_cook_out, client->client_name); } @@ -1124,7 +1122,7 @@ rend_check_authorization(rend_service_t *service, if (!auth_client) { char descriptor_cookie_base64[3*REND_DESC_COOKIE_LEN_BASE64]; base64_encode(descriptor_cookie_base64, sizeof(descriptor_cookie_base64), - descriptor_cookie, REND_DESC_COOKIE_LEN); + descriptor_cookie, REND_DESC_COOKIE_LEN, 0); log_info(LD_REND, "No authorization found for descriptor cookie '%s'! " "Dropping cell!", descriptor_cookie_base64); diff --git a/src/or/router.c b/src/or/router.c index 2ddaa89..b803ba5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2424,7 +2424,7 @@ router_dump_router_to_string(routerinfo_t *router, char kbuf[128]; base64_encode(kbuf, sizeof(kbuf), (const char *)router->onion_curve25519_pkey->public_key, - CURVE25519_PUBKEY_LEN); + CURVE25519_PUBKEY_LEN, BASE64_ENCODE_MULTILINE); smartlist_add_asprintf(chunks, "ntor-onion-key %s", kbuf); } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fd3971c..b9a36a3 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -664,7 +664,8 @@ router_get_dirobj_signature(const char *digest, goto truncated; i = strlen(buf); - if (base64_encode(buf+i, buf_len-i, signature, siglen) < 0) { + if (base64_encode(buf+i, buf_len-i, signature, siglen, + BASE64_ENCODE_MULTILINE) < 0) { log_warn(LD_BUG,"couldn't base64-encode signature"); goto err; } diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index e9fb8bf..299373e 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -14,6 +14,8 @@ #include "crypto_ed25519.h" #include "ed25519_vectors.inc" +#include <openssl/evp.h> + extern const char AUTHORITY_SIGNKEY_3[]; extern const char AUTHORITY_SIGNKEY_A_DIGEST[]; extern const char AUTHORITY_SIGNKEY_A_DIGEST256[]; @@ -601,6 +603,22 @@ test_crypto_digests(void *arg) crypto_pk_free(k); } +/** Encode src into dest with OpenSSL's EVP Encode interface, returning the + * length of the encoded data in bytes. + */ +static int +base64_encode_evp(char *dest, char *src, size_t srclen) +{ + const unsigned char *s = (unsigned char*)src; + EVP_ENCODE_CTX ctx; + int len, ret; + + EVP_EncodeInit(&ctx); + EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, srclen); + EVP_EncodeFinal(&ctx, (unsigned char *)(dest + len), &ret); + return ret+ len; +} + /** Run unit tests for misc crypto formatting functionality (base64, base32, * fingerprints, etc) */ static void @@ -618,7 +636,7 @@ test_crypto_formats(void *arg) /* Base64 tests */ memset(data1, 6, 1024); for (idx = 0; idx < 10; ++idx) { - i = base64_encode(data2, 1024, data1, idx); + i = base64_encode(data2, 1024, data1, idx, 0); tt_int_op(i, OP_GE, 0); j = base64_decode(data3, 1024, data2, i); tt_int_op(j,OP_EQ, idx); @@ -628,7 +646,7 @@ test_crypto_formats(void *arg) strlcpy(data1, "Test string that contains 35 chars.", 1024); strlcat(data1, " 2nd string that contains 35 chars.", 1024); - i = base64_encode(data2, 1024, data1, 71); + i = base64_encode(data2, 1024, data1, 71, 0); tt_int_op(i, OP_GE, 0); j = base64_decode(data3, 1024, data2, i); tt_int_op(j,OP_EQ, 71); @@ -647,6 +665,20 @@ test_crypto_formats(void *arg) tt_assert(digest_from_base64(data3, "###") < 0); + for (i = 0; i < 256; i++) { + /* Test the multiline format Base64 encoder with 0 .. 256 bytes of + * output against OpenSSL. + */ + const size_t enclen = base64_encode_size(i, BASE64_ENCODE_MULTILINE); + data1[i] = i; + j = base64_encode(data2, 1024, data1, i, BASE64_ENCODE_MULTILINE); + tt_int_op(j, OP_EQ, enclen); + j = base64_encode_evp(data3, data1, i); + tt_int_op(j, OP_EQ, enclen); + tt_mem_op(data2, OP_EQ, data3, enclen); + tt_int_op(j, OP_EQ, strlen(data2)); + } + /* Encoding SHA256 */ crypto_rand(data2, DIGEST256_LEN); memset(data2, 100, 1024); diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 5ae1556..c0cab7e 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -486,7 +486,8 @@ generate_certificate(void) EVP_PKEY_get1_RSA(signing_key), RSA_PKCS1_PADDING); signed_len = strlen(buf); - base64_encode(buf+signed_len, sizeof(buf)-signed_len, signature, r); + base64_encode(buf+signed_len, sizeof(buf)-signed_len, signature, r, + BASE64_ENCODE_MULTILINE); strlcat(buf, "-----END ID SIGNATURE-----\n" @@ -501,7 +502,8 @@ generate_certificate(void) RSA_PKCS1_PADDING); strlcat(buf, "-----BEGIN SIGNATURE-----\n", sizeof(buf)); signed_len = strlen(buf); - base64_encode(buf+signed_len, sizeof(buf)-signed_len, signature, r); + base64_encode(buf+signed_len, sizeof(buf)-signed_len, signature, r, + BASE64_ENCODE_MULTILINE); strlcat(buf, "-----END SIGNATURE-----\n", sizeof(buf)); if (!(f = fopen(certificate_file, "w"))) {

1 0

[tor/master] Fix some implicit conversion warnings
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 55118d90ca927d2cdb2cbd92189113da4dcb2fe7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 09:09:20 2015 -0400 Fix some implicit conversion warnings --- src/common/crypto.c | 4 +++- src/test/test_crypto.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2cb1c39..1b45639 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2496,6 +2496,8 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, return -1; if (destlen > SIZE_T_CEILING) return -1; + if (enclen > INT_MAX) + return -1; memset(dest, 0, enclen); @@ -2576,7 +2578,7 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, *d++ = '\0'; /* NUL terminate the output. */ - return enclen; + return (int) enclen; } #undef BASE64_OPENSSL_LINELEN diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 299373e..7f4aa13 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -614,7 +614,7 @@ base64_encode_evp(char *dest, char *src, size_t srclen) int len, ret; EVP_EncodeInit(&ctx); - EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, srclen); + EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, (int)srclen); EVP_EncodeFinal(&ctx, (unsigned char *)(dest + len), &ret); return ret+ len; }

1 0

[tor/master] Merge branch 'feature15652_squashed'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 3acee6142221839137607c9a9cbf8ca4feea5993 Merge: 8a951ed 55118d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 09:09:33 2015 -0400 Merge branch 'feature15652_squashed' changes/feature15652 | 9 ++ src/common/crypto.c | 220 ++++++++++++++++++++++++++++++-------------- src/common/crypto.h | 5 +- src/common/crypto_format.c | 2 +- src/or/connection.c | 19 +--- src/or/dirvote.c | 5 +- src/or/rendclient.c | 7 +- src/or/rendcommon.c | 3 +- src/or/rendservice.c | 10 +- src/or/router.c | 2 +- src/or/routerparse.c | 3 +- src/test/test_crypto.c | 36 +++++++- src/tools/tor-gencert.c | 6 +- 13 files changed, 221 insertions(+), 106 deletions(-)

1 0

[tor/master] Reachability should check ExtendAllowPrivateAddresses not TestingTorNetwork
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9139aeadb8bb41551d351846b4894dd9fe6254d1 Author: teor <teor2345(a)gmail.com> Date: Wed Apr 22 23:54:21 2015 +1000 Reachability should check ExtendAllowPrivateAddresses not TestingTorNetwork When self-testing reachability, use ExtendAllowPrivateAddresses to determine if local/private addresses imply reachability. The previous fix used TestingTorNetwork, which implies ExtendAllowPrivateAddresses, but this excluded rare configs where ExtendAllowPrivateAddresses is set but TestingTorNetwork is not. Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924. Patch by "teor", issue discovered by CJ Ess. --- changes/bug-15771-reachability | 8 ++++++++ src/or/circuitbuild.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug-15771-reachability b/changes/bug-15771-reachability new file mode 100644 index 0000000..aff6268 --- /dev/null +++ b/changes/bug-15771-reachability @@ -0,0 +1,8 @@ + o Minor bugfixes (test networks) + - When self-testing reachability, use ExtendAllowPrivateAddresses + to determine if local/private addresses imply reachability. + The previous fix used TestingTorNetwork, which implies + ExtendAllowPrivateAddresses, but this excluded rare configs where + ExtendAllowPrivateAddresses is set but TestingTorNetwork is not. + Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924. + Patch by "teor", issue discovered by CJ Ess. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 985234f..0688398 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1400,9 +1400,12 @@ onionskin_answer(or_circuit_t *circ, log_debug(LD_CIRC,"Finished sending '%s' cell.", circ->is_first_hop ? "created_fast" : "created"); - /* Ignore the local bit when testing - many test networks run on local - * addresses */ - if ((!channel_is_local(circ->p_chan) || get_options()->TestingTorNetwork) + /* Ignore the local bit when ExtendAllowPrivateAddresses is set: + * it violates the assumption that private addresses are local. + * Also, many test networks run on local addresses, and + * TestingTorNetwork sets ExtendAllowPrivateAddresses. */ + if ((!channel_is_local(circ->p_chan) + || get_options()->ExtendAllowPrivateAddresses) && !channel_is_outgoing(circ->p_chan)) { /* record that we could process create cells from a non-local conn * that we didn't initiate; presumably this means that create cells

1 0

[tor/master] Merge remote-tracking branch 'teor/bug-15771-reachability'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 8a951ed15816b028baf30a0606b9a15a39a36601 Merge: 9b87a6c 9139aea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 09:04:53 2015 -0400 Merge remote-tracking branch 'teor/bug-15771-reachability' changes/bug-15771-reachability | 8 ++++++++ src/or/circuitbuild.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] Use correct severity in the get_if_addrs tests.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9a9ab455a3e1629f84ae3fc1c5af2fc7e41b1107 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Apr 21 16:42:07 2015 +0000 Use correct severity in the get_if_addrs tests. --- changes/bug15759 | 6 ++++++ src/test/test_address.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug15759 b/changes/bug15759 new file mode 100644 index 0000000..24c5eb0 --- /dev/null +++ b/changes/bug15759 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - Set the severity correctly when testing get_interface_addresses_ifaddrs() + and get_interface_addresses_win32(), so that the tests fail gracefully + instead of triggering an assertion. Fixes bug 15759; bugfix on + 0.2.6.3-alpha. Reported by Nicolas Derive. + diff --git a/src/test/test_address.c b/src/test/test_address.c index 5236162..d13d678 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -222,7 +222,7 @@ test_address_get_if_addrs_ifaddrs(void *arg) (void)arg; - results = get_interface_addresses_ifaddrs(0); + results = get_interface_addresses_ifaddrs(LOG_ERR); tt_int_op(smartlist_len(results),>=,1); tt_assert(smartlist_contains_localhost_tor_addr(results)); @@ -245,7 +245,7 @@ test_address_get_if_addrs_win32(void *arg) (void)arg; - results = get_interface_addresses_win32(0); + results = get_interface_addresses_win32(LOG_ERR); tt_int_op(smartlist_len(results),>=,1); tt_assert(smartlist_contains_localhost_tor_addr(results));

1 0

[tor/master] Merge remote-tracking branch 'yawning/bug15759'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9b87a6c156fb4834649772ef9eb6be0a41d096de Merge: f15e7d4 9a9ab45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 09:02:55 2015 -0400 Merge remote-tracking branch 'yawning/bug15759' changes/bug15759 | 6 ++++++ src/test/test_address.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit 51742da463aeaba273cbe75f5472a2d3cac09d95 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 12:45:22 2015 +0000 Update translations for tails-persistence-setup_completed --- ko/ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/ko.po b/ko/ko.po index 06a57e3..3375b13 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-04-23 11:38+0000\n" +"PO-Revision-Date: 2015-04-23 12:34+0000\n" "Last-Translator: Revi_ <revi(a)fastlizard4.org>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit 758596b0b4162a140e177fb302da7b2a50d40b2f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 12:45:18 2015 +0000 Update translations for tails-persistence-setup --- ko/ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/ko.po b/ko/ko.po index 06a57e3..3375b13 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-04-23 11:38+0000\n" +"PO-Revision-Date: 2015-04-23 12:34+0000\n" "Last-Translator: Revi_ <revi(a)fastlizard4.org>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit 38a6fd0f4ceba0cd4ebdfd0b47d2d714af617c97 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 11:45:24 2015 +0000 Update translations for tails-persistence-setup_completed --- ko/ko.po | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 018f316..06a57e3 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -5,13 +5,14 @@ # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 +# Revi_ <revi(a)fastlizard4.org>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-18 09:30+0000\n" -"Last-Translator: Dr.what <javrick6(a)naver.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-04-23 11:38+0000\n" +"Last-Translator: Revi_ <revi(a)fastlizard4.org>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,26 +93,34 @@ msgid "Printers configuration" msgstr "프린터 구성" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Bitcoin client" +msgstr "비트코인 클라이언트" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Electrum's bitcoin wallet and configuration" +msgstr "일렉트럼의 비트코인 지갑 및 설정" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT 패키지" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "APT가 다운로드 한 패키지" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT 목록" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "APT 다운로드 한 목록" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "도트 파일" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "`도트 파일 '디렉토리에 있는 $HOME의 각 파일이나 디렉토리에 대한 심볼릭 링크" @@ -120,67 +129,67 @@ msgstr "`도트 파일 '디렉토리에 있는 $HOME의 각 파일이나 디렉 msgid "Setup Tails persistent volume" msgstr "Talis의 영구적 볼륨을 설정" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "오류" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "장치 %s에 이미 영구적 볼륨이 있습니다." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "장치 %s에 할당되지 않은 충분한 공간이 없습니다." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "장치 %s에 영구적 볼륨이 없습니다." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "사용중인 영구적 볼륨을 제거 할 수 없습니다. 영구을 오프하고 Tails를 다시 시작해야합니다." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." msgstr "영구적 볼륨의 잠금이 해제되지 않습니다." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "영구적 볼륨이 마운트되지 않습니다." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "영구적 볼륨을 읽어 들일 수 없습니다. 허가와 소유권에 문제가 있을지도 모릅니다." -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "영구적 볼륨에 쓸 수는 없습니다. 읽기 전용으로 마운트된 가능성이 있습니다." -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails 현재 USB 또는 SDIO 아닌 %s 장치에서 작동합니다." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "장치%s 는 광학 기기입니다." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "장치 %s는 Tails 설치 프로그램을 사용하여 작성되지 않았습니다." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "영구 마법사 - 종료" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015