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

[tor/master] Merge branch 'bug18296_squashed'
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 48c1c028ca65c9fbdb83f47e5ccda0469b031bdd Merge: 882e0fb 21f7299 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:32:18 2016 -0500 Merge branch 'bug18296_squashed' changes/bug18296 | 4 ++++ src/common/container.c | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/master] Restrict the meaning of digests_t to sha1+sha256.
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 39b597c2fd8b45ff61573c70c36e8a4846cf3a0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 13:10:17 2016 -0500 Restrict the meaning of digests_t to sha1+sha256. This saves CPU and RAM when handling consensuses and x509 certs. Closes ticket 17795; bug not in any released tor. --- src/common/crypto.c | 3 ++- src/common/crypto.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index a42c461..9f1ce93 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1655,7 +1655,7 @@ crypto_digest_all(digests_t *ds_out, const char *m, size_t len) memset(ds_out, 0, sizeof(*ds_out)); if (crypto_digest(ds_out->d[DIGEST_SHA1], m, len) < 0) return -1; - for (i = DIGEST_SHA256; i < N_DIGEST_ALGORITHMS; ++i) { + for (i = DIGEST_SHA256; i < N_COMMON_DIGEST_ALGORITHMS; ++i) { switch (i) { case DIGEST_SHA256: /* FALLSTHROUGH */ case DIGEST_SHA3_256: @@ -1664,6 +1664,7 @@ crypto_digest_all(digests_t *ds_out, const char *m, size_t len) break; case DIGEST_SHA512: case DIGEST_SHA3_512: /* FALLSTHROUGH */ + tor_assert(0); /* These won't fit. */ if (crypto_digest512(ds_out->d[i], m, len, i) < 0) return -1; break; diff --git a/src/common/crypto.h b/src/common/crypto.h index fa2ed61..73b94b7 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -100,8 +100,10 @@ typedef enum { DIGEST_SHA3_512 = 4, } digest_algorithm_t; #define N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1) +#define N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1) -/** A set of all the digests we know how to compute, taken on a single + +/** A set of all the digests we commonly compute, taken on a single * string. Any digests that are shorter than 512 bits are right-padded * with 0 bits. * @@ -110,7 +112,7 @@ typedef enum { * once. **/ typedef struct { - char d[N_DIGEST_ALGORITHMS][DIGEST512_LEN]; + char d[N_COMMON_DIGEST_ALGORITHMS][DIGEST256_LEN]; } digests_t; typedef struct crypto_pk_t crypto_pk_t;

1 0

[tor/master] Rename crypto_digest_all, and digests_t.
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 8a4bba06d27c99e7c1e7930761b3998a27787ce9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:28:19 2016 -0500 Rename crypto_digest_all, and digests_t. They are no longer "all" digests, but only the "common" digests. Part of 17795. This is an automated patch I made with a couple of perl one-liners: perl -i -pe 's/crypto_digest_all/crypto_common_digests/g;' src/*/*.[ch] perl -i -pe 's/\bdigests_t\b/common_digests_t/g;' src/*/*.[ch] --- src/common/crypto.c | 24 ++++++++++++------------ src/common/crypto.h | 6 +++--- src/common/tortls.c | 6 +++--- src/common/tortls.h | 8 ++++---- src/or/channeltls.c | 4 ++-- src/or/connection_or.c | 2 +- src/or/dirserv.c | 4 ++-- src/or/dirserv.h | 2 +- src/or/dirvote.c | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 4 ++-- src/or/routerkeys.c | 4 ++-- src/or/routerparse.c | 24 ++++++++++++------------ src/or/routerparse.h | 2 +- src/test/test_crypto.c | 2 +- src/test/test_dir.c | 10 +++++----- src/test/test_dir_handle_get.c | 2 +- src/test/test_tortls.c | 6 +++--- 18 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 9f1ce93..2ebf203 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1323,7 +1323,7 @@ crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out) /** Compute all digests of the DER encoding of pk, and store them * in digests_out. Return 0 on success, -1 on failure. */ int -crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out) +crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out) { unsigned char *buf = NULL; int len; @@ -1331,7 +1331,7 @@ crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out) len = i2d_RSAPublicKey(pk->key, &buf); if (len < 0 || buf == NULL) return -1; - if (crypto_digest_all(digests_out, (char*)buf, len) < 0) { + if (crypto_common_digests(digests_out, (char*)buf, len) < 0) { OPENSSL_free(buf); return -1; } @@ -1644,11 +1644,11 @@ crypto_digest512(char *digest, const char *m, size_t len, == -1); } -/** Set the digests_t in ds_out to contain every digest on the +/** Set the common_digests_t in ds_out to contain every digest on the * len bytes in m that we know how to compute. Return 0 on * success, -1 on failure. */ int -crypto_digest_all(digests_t *ds_out, const char *m, size_t len) +crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len) { int i; tor_assert(ds_out); @@ -1757,7 +1757,7 @@ struct crypto_digest_t { * when we free one. */ static size_t -crypto_digest_alloc_bytes(digest_algorithm_t alg) +crypto_common_digestsoc_bytes(digest_algorithm_t alg) { /* Helper: returns the number of bytes in the 'f' field of 'st' */ #define STRUCT_FIELD_SIZE(st, f) (sizeof( ((st*)0)->f )) @@ -1788,7 +1788,7 @@ crypto_digest_t * crypto_digest_new(void) { crypto_digest_t *r; - r = tor_malloc(crypto_digest_alloc_bytes(DIGEST_SHA1)); + r = tor_malloc(crypto_common_digestsoc_bytes(DIGEST_SHA1)); SHA1_Init(&r->d.sha1); r->algorithm = DIGEST_SHA1; return r; @@ -1801,7 +1801,7 @@ crypto_digest256_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256); - r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); + r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); if (algorithm == DIGEST_SHA256) SHA256_Init(&r->d.sha2); else @@ -1817,7 +1817,7 @@ crypto_digest512_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512); - r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); + r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); if (algorithm == DIGEST_SHA512) SHA512_Init(&r->d.sha512); else @@ -1833,7 +1833,7 @@ crypto_digest_free(crypto_digest_t *digest) { if (!digest) return; - size_t bytes = crypto_digest_alloc_bytes(digest->algorithm); + size_t bytes = crypto_common_digestsoc_bytes(digest->algorithm); memwipe(digest, 0, bytes); tor_free(digest); } @@ -1893,7 +1893,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, return; } - const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); /* memcpy into a temporary ctx, since SHA*_Final clears the context */ memcpy(&tmpenv, digest, alloc_bytes); switch (digest->algorithm) { @@ -1925,7 +1925,7 @@ crypto_digest_t * crypto_digest_dup(const crypto_digest_t *digest) { tor_assert(digest); - const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); return tor_memdup(digest, alloc_bytes); } @@ -1940,7 +1940,7 @@ crypto_digest_assign(crypto_digest_t *into, tor_assert(into); tor_assert(from); tor_assert(into->algorithm == from->algorithm); - const size_t alloc_bytes = crypto_digest_alloc_bytes(from->algorithm); + const size_t alloc_bytes = crypto_common_digestsoc_bytes(from->algorithm); memcpy(into,from,alloc_bytes); } diff --git a/src/common/crypto.h b/src/common/crypto.h index 73b94b7..2aa49d3 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -113,7 +113,7 @@ typedef enum { **/ typedef struct { char d[N_COMMON_DIGEST_ALGORITHMS][DIGEST256_LEN]; -} digests_t; +} common_digests_t; typedef struct crypto_pk_t crypto_pk_t; typedef struct crypto_cipher_t crypto_cipher_t; @@ -193,7 +193,7 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out); +int crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); @@ -222,7 +222,7 @@ int crypto_digest256(char *digest, const char *m, size_t len, digest_algorithm_t algorithm); int crypto_digest512(char *digest, const char *m, size_t len, digest_algorithm_t algorithm); -int crypto_digest_all(digests_t *ds_out, const char *m, size_t len); +int crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len); struct smartlist_t; void crypto_digest_smartlist_prefix(char *digest_out, size_t len_out, const char *prepend, diff --git a/src/common/tortls.c b/src/common/tortls.c index 6e4cd3d..688a755 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -685,7 +685,7 @@ MOCK_IMPL(STATIC tor_x509_cert_t *, cert->cert = x509_cert; - crypto_digest_all(&cert->cert_digests, + crypto_common_digests(&cert->cert_digests, (char*)cert->encoded, cert->encoded_len); if ((pkey = X509_get_pubkey(x509_cert)) && @@ -754,7 +754,7 @@ tor_x509_cert_get_der(const tor_x509_cert_t *cert, /** Return a set of digests for the public key in cert, or NULL if this * cert's public key is not one we know how to take the digest of. */ -const digests_t * +const common_digests_t * tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert) { if (cert->pkey_digests_set) @@ -764,7 +764,7 @@ tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert) } /** Return a set of digests for the public key in cert. */ -const digests_t * +const common_digests_t * tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert) { return &cert->cert_digests; diff --git a/src/common/tortls.h b/src/common/tortls.h index 6a4ef9a..97ca8fd 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -82,8 +82,8 @@ struct tor_x509_cert_t { uint8_t *encoded; size_t encoded_len; unsigned pkey_digests_set : 1; - digests_t cert_digests; - digests_t pkey_digests; + common_digests_t cert_digests; + common_digests_t pkey_digests; }; /** Holds a SSL object and its associated data. Members are only @@ -237,8 +237,8 @@ tor_x509_cert_t *tor_x509_cert_decode(const uint8_t *certificate, size_t certificate_len); void tor_x509_cert_get_der(const tor_x509_cert_t *cert, const uint8_t **encoded_out, size_t *size_out); -const digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert); -const digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert); int tor_tls_get_my_certs(int server, const tor_x509_cert_t **link_cert_out, const tor_x509_cert_t **id_cert_out); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f0333e8..a4c5708 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1819,7 +1819,7 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) chan->conn->handshake_state->authenticated = 1; { - const digests_t *id_digests = tor_x509_cert_get_id_digests(id_cert); + const common_digests_t *id_digests = tor_x509_cert_get_id_digests(id_cert); crypto_pk_t *identity_rcvd; if (!id_digests) ERR("Couldn't compute digests for key in ID cert"); @@ -2109,7 +2109,7 @@ channel_tls_process_authenticate_cell(var_cell_t *cell, channel_tls_t *chan) { crypto_pk_t *identity_rcvd = tor_tls_cert_get_key(chan->conn->handshake_state->id_cert); - const digests_t *id_digests = + const common_digests_t *id_digests = tor_x509_cert_get_id_digests(chan->conn->handshake_state->id_cert); /* This must exist; we checked key type when reading the cert. */ diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 29e8153..6f40e6a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2318,7 +2318,7 @@ connection_or_compute_authenticate_cell_body(or_connection_t *conn, { const tor_x509_cert_t *id_cert=NULL, *link_cert=NULL; - const digests_t *my_digests, *their_digests; + const common_digests_t *my_digests, *their_digests; const uint8_t *my_id, *their_id, *client_id, *server_id; if (tor_tls_get_my_certs(server, &link_cert, &id_cert)) goto err; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 491557e..d50863a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1230,7 +1230,7 @@ free_cached_dir_(void *_d) void dirserv_set_cached_consensus_networkstatus(const char *networkstatus, const char *flavor_name, - const digests_t *digests, + const common_digests_t *digests, time_t published) { cached_dir_t *new_networkstatus; @@ -1239,7 +1239,7 @@ dirserv_set_cached_consensus_networkstatus(const char *networkstatus, cached_consensuses = strmap_new(); new_networkstatus = new_cached_dir(tor_strdup(networkstatus), published); - memcpy(&new_networkstatus->digests, digests, sizeof(digests_t)); + memcpy(&new_networkstatus->digests, digests, sizeof(common_digests_t)); old_networkstatus = strmap_set(cached_consensuses, flavor_name, new_networkstatus); if (old_networkstatus) diff --git a/src/or/dirserv.h b/src/or/dirserv.h index d07339b..25a2a91 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -64,7 +64,7 @@ int directory_too_idle_to_fetch_descriptors(const or_options_t *options, cached_dir_t *dirserv_get_consensus(const char *flavor_name); void dirserv_set_cached_consensus_networkstatus(const char *consensus, const char *flavor_name, - const digests_t *digests, + const common_digests_t *digests, time_t published); void dirserv_clear_old_networkstatuses(time_t cutoff); int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key, diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b61b33a..80e4c33 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2114,7 +2114,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target, /** Make sure all the digests we know match, and at least one matches. */ { - digests_t *digests = strmap_get(sigs->digests, flavor); + common_digests_t *digests = strmap_get(sigs->digests, flavor); int n_matches = 0; int alg; if (!digests) { diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index f3a8276..11ee618 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1526,7 +1526,7 @@ networkstatus_set_current_consensus(const char *consensus, const unsigned dl_certs = !(flags & NSSET_DONT_DOWNLOAD_CERTS); const unsigned accept_obsolete = flags & NSSET_ACCEPT_OBSOLETE; const unsigned require_flavor = flags & NSSET_REQUIRE_FLAVOR; - const digests_t *current_digests = NULL; + const common_digests_t *current_digests = NULL; consensus_waiting_for_certs_t *waiting = NULL; time_t current_valid_after = 0; int free_consensus = 1; /* Free 'c' at the end of the function */ diff --git a/src/or/or.h b/src/or/or.h index 6faeb34..289ffb8 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1935,7 +1935,7 @@ typedef struct cached_dir_t { size_t dir_len; /**< Length of dir (not counting its NUL). */ size_t dir_z_len; /**< Length of dir_z. */ time_t published; /**< When was this object published. */ - digests_t digests; /**< Digests of this object (networkstatus only) */ + common_digests_t digests; /**< Digests of this object (networkstatus only) */ int refcnt; /**< Reference count for this cached_dir_t. */ } cached_dir_t; @@ -2572,7 +2572,7 @@ typedef struct networkstatus_t { struct authority_cert_t *cert; /**< Vote only: the voter's certificate. */ /** Digests of this document, as signed. */ - digests_t digests; + common_digests_t digests; /** List of router statuses, sorted by identity digest. For a vote, * the elements are vote_routerstatus_t; for a consensus, the elements diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..210178d 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -927,7 +927,7 @@ generate_ed_link_cert(const or_options_t *options, time_t now) return -1; } - const digests_t *digests = tor_x509_cert_get_cert_digests(link); + const common_digests_t *digests = tor_x509_cert_get_cert_digests(link); if (link_cert_cert && ! EXPIRES_SOON(link_cert_cert, options->TestingLinkKeySlop) && @@ -972,7 +972,7 @@ should_make_new_ed_keys(const or_options_t *options, const time_t now) if (tor_tls_get_my_certs(1, &link, &id) < 0 || link == NULL) return 1; - const digests_t *digests = tor_x509_cert_get_cert_digests(link); + const common_digests_t *digests = tor_x509_cert_get_cert_digests(link); if (!fast_memeq(digests->d[DIGEST_SHA256], link_cert_cert->signed_key.pubkey, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fafba96..7323f80 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -538,7 +538,7 @@ static int router_get_hash_impl(const char *s, size_t s_len, char *digest, char end_char, digest_algorithm_t alg); static int router_get_hashes_impl(const char *s, size_t s_len, - digests_t *digests, + common_digests_t *digests, const char *start_str, const char *end_str, char end_char); static void token_clear(directory_token_t *tok); @@ -638,7 +638,7 @@ router_get_router_hash(const char *s, size_t s_len, char *digest) /** Set digests to all the digests of the consensus document in * s */ int -router_get_networkstatus_v3_hashes(const char *s, digests_t *digests) +router_get_networkstatus_v3_hashes(const char *s, common_digests_t *digests) { return router_get_hashes_impl(s,strlen(s),digests, "network-status-version", @@ -2847,7 +2847,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, smartlist_t *rs_tokens = NULL, *footer_tokens = NULL; networkstatus_voter_info_t *voter = NULL; networkstatus_t *ns = NULL; - digests_t ns_digests; + common_digests_t ns_digests; const char *cert, *end_of_header, *end_of_footer, *s_dup = s; directory_token_t *tok; int ok; @@ -3443,15 +3443,15 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, return ns; } -/** Return the digests_t that holds the digests of the +/** Return the common_digests_t that holds the digests of the * flavor_name-flavored networkstatus according to the detached - * signatures document sigs, allocating a new digests_t as neeeded. */ -static digests_t * + * signatures document sigs, allocating a new common_digests_t as neeeded. */ +static common_digests_t * detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name) { - digests_t *d = strmap_get(sigs->digests, flavor_name); + common_digests_t *d = strmap_get(sigs->digests, flavor_name); if (!d) { - d = tor_malloc_zero(sizeof(digests_t)); + d = tor_malloc_zero(sizeof(common_digests_t)); strmap_set(sigs->digests, flavor_name, d); } return d; @@ -3459,7 +3459,7 @@ detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name) /** Return the list of signatures of the flavor_name-flavored * networkstatus according to the detached signatures document sigs, - * allocating a new digests_t as neeeded. */ + * allocating a new common_digests_t as neeeded. */ static smartlist_t * detached_get_signatures(ns_detached_signatures_t *sigs, const char *flavor_name) @@ -3481,7 +3481,7 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos) * networkstatus_parse_vote_from_string(). */ directory_token_t *tok; memarea_t *area = NULL; - digests_t *digests; + common_digests_t *digests; smartlist_t *tokens = smartlist_new(); ns_detached_signatures_t *sigs = @@ -4444,7 +4444,7 @@ router_get_hash_impl(const char *s, size_t s_len, char *digest, /** As router_get_hash_impl, but compute all hashes. */ static int -router_get_hashes_impl(const char *s, size_t s_len, digests_t *digests, +router_get_hashes_impl(const char *s, size_t s_len, common_digests_t *digests, const char *start_str, const char *end_str, char end_c) { @@ -4453,7 +4453,7 @@ router_get_hashes_impl(const char *s, size_t s_len, digests_t *digests, &start,&end)<0) return -1; - if (crypto_digest_all(digests, start, end-start)) { + if (crypto_common_digests(digests, start, end-start)) { log_warn(LD_BUG,"couldn't compute digests"); return -1; } diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 99fd528..4745740 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -14,7 +14,7 @@ int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_dir_hash(const char *s, char *digest); -int router_get_networkstatus_v3_hashes(const char *s, digests_t *digests); +int router_get_networkstatus_v3_hashes(const char *s, common_digests_t *digests); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); #define DIROBJ_MAX_SIG_LEN 256 char *router_get_dirobj_signature(const char *digest, diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index fb21f3a..5ac20b9 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1084,7 +1084,7 @@ test_crypto_digests(void *arg) { crypto_pk_t *k = NULL; ssize_t r; - digests_t pkey_digests; + common_digests_t pkey_digests; char digest[DIGEST_LEN]; (void)arg; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4824a94..b770047 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1999,11 +1999,11 @@ test_a_networkstatus( tt_assert(con_md3); /* All three should have the same digest. */ - tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(digests_t)); - tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(digests_t)); + tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(common_digests_t)); + tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(common_digests_t)); /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3); @@ -2017,7 +2017,7 @@ test_a_networkstatus( tt_int_op(dsig1->fresh_until,OP_EQ, con3->fresh_until); tt_int_op(dsig1->valid_until,OP_EQ, con3->valid_until); { - digests_t *dsig_digests = strmap_get(dsig1->digests, "ns"); + common_digests_t *dsig_digests = strmap_get(dsig1->digests, "ns"); tt_assert(dsig_digests); tt_mem_op(dsig_digests->d[DIGEST_SHA1], OP_EQ, con3->digests.d[DIGEST_SHA1], DIGEST_LEN); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index e1ac50e..9d8e840 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -1764,7 +1764,7 @@ static void status_vote_current_consensus_ns_test(char **header, char **body, size_t *body_len) { - digests_t digests; + common_digests_t digests; dir_connection_t *conn = NULL; #define NETWORK_STATUS "some network status string" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index add020e..52aba5a 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -555,10 +555,10 @@ test_tortls_x509_cert_get_id_digests(void *ignored) { (void)ignored; tor_x509_cert_t *cert; - digests_t *d; - const digests_t *res; + common_digests_t *d; + const common_digests_t *res; cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - d = tor_malloc_zero(sizeof(digests_t)); + d = tor_malloc_zero(sizeof(common_digests_t)); d->d[0][0] = 42; res = tor_x509_cert_get_id_digests(cert);

1 0

[tor/master] Fix an erroneous renaming
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit e202f3a1ca2d2ef87820d0ff618a37d76b4e702a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:22:53 2016 -0500 Fix an erroneous renaming Did you know that crypto_digest_all is a substring of crypto_digest_alloc_bytes()? Hence the mysterious emergence of "crypto_common_digestsoc_bytes". Next time I should use the \b assertion in my regexen. Spotted by Mike. --- src/common/crypto.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 6c40c6e..9e66ded 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1742,7 +1742,7 @@ struct crypto_digest_t { * when we free one. */ static size_t -crypto_common_digestsoc_bytes(digest_algorithm_t alg) +crypto_digest_alloc_bytes(digest_algorithm_t alg) { /* Helper: returns the number of bytes in the 'f' field of 'st' */ #define STRUCT_FIELD_SIZE(st, f) (sizeof( ((st*)0)->f )) @@ -1773,7 +1773,7 @@ crypto_digest_t * crypto_digest_new(void) { crypto_digest_t *r; - r = tor_malloc(crypto_common_digestsoc_bytes(DIGEST_SHA1)); + r = tor_malloc(crypto_digest_alloc_bytes(DIGEST_SHA1)); SHA1_Init(&r->d.sha1); r->algorithm = DIGEST_SHA1; return r; @@ -1786,7 +1786,7 @@ crypto_digest256_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256); - r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); + r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); if (algorithm == DIGEST_SHA256) SHA256_Init(&r->d.sha2); else @@ -1802,7 +1802,7 @@ crypto_digest512_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512); - r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); + r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); if (algorithm == DIGEST_SHA512) SHA512_Init(&r->d.sha512); else @@ -1818,7 +1818,7 @@ crypto_digest_free(crypto_digest_t *digest) { if (!digest) return; - size_t bytes = crypto_common_digestsoc_bytes(digest->algorithm); + size_t bytes = crypto_digest_alloc_bytes(digest->algorithm); memwipe(digest, 0, bytes); tor_free(digest); } @@ -1878,7 +1878,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, return; } - const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); /* memcpy into a temporary ctx, since SHA*_Final clears the context */ memcpy(&tmpenv, digest, alloc_bytes); switch (digest->algorithm) { @@ -1910,7 +1910,7 @@ crypto_digest_t * crypto_digest_dup(const crypto_digest_t *digest) { tor_assert(digest); - const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); return tor_memdup(digest, alloc_bytes); } @@ -1925,7 +1925,7 @@ crypto_digest_assign(crypto_digest_t *into, tor_assert(into); tor_assert(from); tor_assert(into->algorithm == from->algorithm); - const size_t alloc_bytes = crypto_common_digestsoc_bytes(from->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(from->algorithm); memcpy(into,from,alloc_bytes); }

1 0

[tor/master] Whitespace fixes
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit a8d69895897056fcc313914e9d611d3c9008e17c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:35:46 2016 -0500 Whitespace fixes --- src/common/crypto.h | 4 ++-- src/common/tortls.h | 6 ++++-- src/or/channeltls.c | 3 ++- src/or/dirserv.h | 6 +++--- src/or/routerparse.c | 3 ++- src/or/routerparse.h | 3 ++- src/test/test_dir.c | 6 ++++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/common/crypto.h b/src/common/crypto.h index f1e4981..9535c4e 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -102,7 +102,6 @@ typedef enum { #define N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1) #define N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1) - /** A set of all the digests we commonly compute, taken on a single * string. Any digests that are shorter than 512 bits are right-padded * with 0 bits. @@ -193,7 +192,8 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out); +int crypto_pk_get_common_digests(crypto_pk_t *pk, + common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); diff --git a/src/common/tortls.h b/src/common/tortls.h index 97ca8fd..d235ca5 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -237,8 +237,10 @@ tor_x509_cert_t *tor_x509_cert_decode(const uint8_t *certificate, size_t certificate_len); void tor_x509_cert_get_der(const tor_x509_cert_t *cert, const uint8_t **encoded_out, size_t *size_out); -const common_digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert); -const common_digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_id_digests( + const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_cert_digests( + const tor_x509_cert_t *cert); int tor_tls_get_my_certs(int server, const tor_x509_cert_t **link_cert_out, const tor_x509_cert_t **id_cert_out); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a4c5708..016ef75 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1819,7 +1819,8 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) chan->conn->handshake_state->authenticated = 1; { - const common_digests_t *id_digests = tor_x509_cert_get_id_digests(id_cert); + const common_digests_t *id_digests = + tor_x509_cert_get_id_digests(id_cert); crypto_pk_t *identity_rcvd; if (!id_digests) ERR("Couldn't compute digests for key in ID cert"); diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 25a2a91..df23450 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -63,9 +63,9 @@ int directory_too_idle_to_fetch_descriptors(const or_options_t *options, cached_dir_t *dirserv_get_consensus(const char *flavor_name); void dirserv_set_cached_consensus_networkstatus(const char *consensus, - const char *flavor_name, - const common_digests_t *digests, - time_t published); + const char *flavor_name, + const common_digests_t *digests, + time_t published); void dirserv_clear_old_networkstatuses(time_t cutoff); int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key, const char **msg, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7323f80..2173213 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3445,7 +3445,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, /** Return the common_digests_t that holds the digests of the * flavor_name-flavored networkstatus according to the detached - * signatures document sigs, allocating a new common_digests_t as neeeded. */ + * signatures document sigs, allocating a new common_digests_t as + * neeeded. */ static common_digests_t * detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name) { diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 4745740..723d5d8 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -14,7 +14,8 @@ int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_dir_hash(const char *s, char *digest); -int router_get_networkstatus_v3_hashes(const char *s, common_digests_t *digests); +int router_get_networkstatus_v3_hashes(const char *s, + common_digests_t *digests); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); #define DIROBJ_MAX_SIG_LEN 256 char *router_get_dirobj_signature(const char *digest, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b770047..ef36303 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2002,8 +2002,10 @@ test_a_networkstatus( tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(common_digests_t)); tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, + sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, + sizeof(common_digests_t)); /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3);

1 0

[tor/master] Another automated rename.
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 9746aed2baffeb3788552f8cdedc5611ab2f91b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:31:43 2016 -0500 Another automated rename. Also simplify crypto_common_digests() to have no loop. --- src/common/crypto.c | 23 ++++------------------- src/common/crypto.h | 2 +- src/common/tortls.c | 2 +- src/test/test_crypto.c | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2ebf203..6c40c6e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1323,7 +1323,7 @@ crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out) /** Compute all digests of the DER encoding of pk, and store them * in digests_out. Return 0 on success, -1 on failure. */ int -crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out) +crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out) { unsigned char *buf = NULL; int len; @@ -1650,28 +1650,13 @@ crypto_digest512(char *digest, const char *m, size_t len, int crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len) { - int i; tor_assert(ds_out); memset(ds_out, 0, sizeof(*ds_out)); if (crypto_digest(ds_out->d[DIGEST_SHA1], m, len) < 0) return -1; - for (i = DIGEST_SHA256; i < N_COMMON_DIGEST_ALGORITHMS; ++i) { - switch (i) { - case DIGEST_SHA256: /* FALLSTHROUGH */ - case DIGEST_SHA3_256: - if (crypto_digest256(ds_out->d[i], m, len, i) < 0) - return -1; - break; - case DIGEST_SHA512: - case DIGEST_SHA3_512: /* FALLSTHROUGH */ - tor_assert(0); /* These won't fit. */ - if (crypto_digest512(ds_out->d[i], m, len, i) < 0) - return -1; - break; - default: - return -1; - } - } + if (crypto_digest256(ds_out->d[DIGEST_SHA256], m, len, DIGEST_SHA256) < 0) + return -1; + return 0; } diff --git a/src/common/crypto.h b/src/common/crypto.h index 2aa49d3..f1e4981 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -193,7 +193,7 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out); +int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); diff --git a/src/common/tortls.c b/src/common/tortls.c index 688a755..3077943 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -691,7 +691,7 @@ MOCK_IMPL(STATIC tor_x509_cert_t *, if ((pkey = X509_get_pubkey(x509_cert)) && (rsa = EVP_PKEY_get1_RSA(pkey))) { crypto_pk_t *pk = crypto_new_pk_from_rsa_(rsa); - crypto_pk_get_all_digests(pk, &cert->pkey_digests); + crypto_pk_get_common_digests(pk, &cert->pkey_digests); cert->pkey_digests_set = 1; crypto_pk_free(pk); EVP_PKEY_free(pkey); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 5ac20b9..14f1ecc 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1098,7 +1098,7 @@ test_crypto_digests(void *arg) tt_mem_op(hex_str(digest, DIGEST_LEN),OP_EQ, AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN); - r = crypto_pk_get_all_digests(k, &pkey_digests); + r = crypto_pk_get_common_digests(k, &pkey_digests); tt_mem_op(hex_str(pkey_digests.d[DIGEST_SHA1], DIGEST_LEN),OP_EQ, AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN);

1 0

[tor/master] Merge branch 'bug17795'
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 882e0fbd76b9b56b943680a310d16fc94ab07438 Merge: b3534df e202f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:25:12 2016 -0500 Merge branch 'bug17795' src/common/crypto.c | 28 +++++++--------------------- src/common/crypto.h | 12 +++++++----- src/common/tortls.c | 8 ++++---- src/common/tortls.h | 10 ++++++---- src/or/channeltls.c | 5 +++-- src/or/connection_or.c | 2 +- src/or/dirserv.c | 4 ++-- src/or/dirserv.h | 6 +++--- src/or/dirvote.c | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 4 ++-- src/or/routerkeys.c | 4 ++-- src/or/routerparse.c | 25 +++++++++++++------------ src/or/routerparse.h | 3 ++- src/test/test_crypto.c | 4 ++-- src/test/test_dir.c | 12 +++++++----- src/test/test_dir_handle_get.c | 2 +- src/test/test_tortls.c | 6 +++--- 18 files changed, 67 insertions(+), 72 deletions(-)

1 0

[tor/master] Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit b3534dfc5e85c82e915c1576a8a58500fdd7c878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:16:51 2016 -0500 Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378 --- src/test/test_address.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 3b17b23..748dfc5 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -297,7 +297,9 @@ test_address_get_if_addrs_ifaddrs(void *arg) } done: - SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); + if (results) { + SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); + } smartlist_free(results); return; }

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit be1508dc0ae86a50c7b57ee969f89ea6a0ffdb7f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 12:15:50 2016 +0000 Update translations for tails-misc_completed --- fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index a3625f7..22e52df 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 18:13+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 12:12+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -389,19 +389,19 @@ msgstr "Le système d'exploitation hôte et le logiciel de virtualisation peuven msgid "Learn more" msgstr "En apprendre davantage" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor n'est pas prêt" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas prêt. Démarrer le navigateur Tor quand même?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Annuler"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit 9e5a0f1aca6696f0c3ef2165f05df7d1b062dd73 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 12:15:46 2016 +0000 Update translations for tails-misc --- fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index a3625f7..22e52df 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 18:13+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 12:12+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -389,19 +389,19 @@ msgstr "Le système d'exploitation hôte et le logiciel de virtualisation peuven msgid "Learn more" msgstr "En apprendre davantage" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor n'est pas prêt" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas prêt. Démarrer le navigateur Tor quand même?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Annuler"

1 0