July 2015 - tor-commits - lists.torproject.org

[translation-tools/master] Add tor-messenger-commandsproperties,
by colin＠torproject.org 16 Jul '15

16 Jul '15

commit 2b6e80bfe5bd071f9be5459f3280e85bfea3d2cf Author: Colin Childs <colin(a)torproject.org> Date: Sun Jun 28 23:54:53 2015 -0500 Add tor-messenger-commandsproperties, tor-messenger-commandsproperties_completed, tor-messenger-contactsproperties, tor-messenger-contactsproperties_completed, tor-messenger-conversationsproperties and tor-messenger-conversationsproperties_completed --- config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config b/config index 982cd61..edfeedf 100644 --- a/config +++ b/config @@ -28,7 +28,10 @@ torbutton-aboutdialogdtd_completed torbutton-abouttorproperties torbutton-abouttorproperties_completed tor-messenger-accountsproperties tor-messenger-accountsproperties_completed tor-messenger-authdtd tor-messenger-authdtd_completed tor-messenger-authproperties -tor-messenger-authproperties_completed" +tor-messenger-authproperties_completed tor-messenger-commandsproperties +tor-messenger-commandsproperties_completed tor-messenger-contactsproperties +tor-messenger-contactsproperties_completed tor-messenger-conversationsproperties +tor-messenger-conversationsproperties_completed" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid

1 0

[tor-messenger-build/master] Add patch for #16508 since we are not building on nightly
by sukhbir＠torproject.org 16 Jul '15

16 Jul '15

commit fe7495545760b966cae98c7a1e3a205c92f9bfaf Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 16 12:26:12 2015 -0400 Add patch for #16508 since we are not building on nightly --- projects/instantbird/config | 2 ++ .../instantbird/osx-saved-application-state.patch | 26 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index e23de89..9cd0343 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,6 +105,8 @@ input_files: - filename: branding/about.png - filename: branding/osx.patch enable: '[% c("var/osx") %]' + - filename: osx-saved-application-state.patch + enable: '[% c("var/osx") %]' - filename: cert-installer.patch enable: '[% c("var/osx") %]' - filename: cert_override.txt diff --git a/projects/instantbird/osx-saved-application-state.patch b/projects/instantbird/osx-saved-application-state.patch new file mode 100644 index 0000000..e92e6f7 --- /dev/null +++ b/projects/instantbird/osx-saved-application-state.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1436500709 25200 +# Thu Jul 09 20:58:29 2015 -0700 +# Node ID 1464e4f7b9d0578859a3c25b55b096be83c782a7 +# Parent dfe08be4ec2350ca30eb7bc9f95f0ab363f25a10 +Set NSDisablePersistence to prevent disk leaks. + +diff --git a/im/app/macbuild/Contents/Info.plist.in b/im/app/macbuild/Contents/Info.plist.in +--- a/im/app/macbuild/Contents/Info.plist.in ++++ b/im/app/macbuild/Contents/Info.plist.in +@@ -25,12 +25,14 @@ + <key>CFBundleVersion</key> + <string>%APP_VERSION%</string> + <key>NSAppleScriptEnabled</key> + <true/> + <key>LSMinimumSystemVersion</key> + <string>10.6.0</string> + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> ++ <key>NSDisablePersistence</key> ++ <true/> + <key>NSPrincipalClass</key> + <string>GeckoNSApplication</string> + </dict> + </plist>

1 0

[tor-messenger-build/master] Use hg and mozilla/aurora with FIREFOX_AURORA_40_END tag
by sukhbir＠torproject.org 16 Jul '15

16 Jul '15

commit 55ca89405e14fc728fe71c52478af1d01f138881 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 16 12:24:16 2015 -0400 Use hg and mozilla/aurora with FIREFOX_AURORA_40_END tag --- projects/mozilla/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mozilla/config b/projects/mozilla/config index 28d6a6e..fd26f4d 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/mozilla/gecko-dev -git_hash: aurora +hg_url: https://hg.mozilla.org/releases/mozilla-aurora/ +hg_hash: FIREFOX_AURORA_40_END src: | #!/bin/sh set -e

1 0

[tor/master] Add my script to dump per-file or per-function coverage
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 90701c1de45ad96b9e4d08938613e754c34f0c3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 11:55:44 2015 -0400 Add my script to dump per-file or per-function coverage --- scripts/test/cov-display | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/scripts/test/cov-display b/scripts/test/cov-display new file mode 100755 index 0000000..6c3bbd5 --- /dev/null +++ b/scripts/test/cov-display @@ -0,0 +1,72 @@ +#!/usr/bin/python +import sys, re + +none0, some0 = 0,0 +branchTaken0, branchNot0 = 0,0 + +BRANCH = False +FUNC = False + +if sys.argv[1] == '-b': + BRANCH = True + del sys.argv[1] + +if sys.argv[1] == '-f': + FUNC = True + del sys.argv[1] + +def show(name, none, some): + if some+none == 0: + none = 1 + print name, none, some, "%.02f"%(100*(float(some)/(some+none))) + +for fn in sys.argv[1:]: + none = some = branchTaken = branchNot = 0 + inFunc = "" + for line in open(fn, 'r'): + m = re.match(r'^[^:]*:([^:]*):(.*)', line) + if m: + body = m.group(2).rstrip() + lineno = m.group(1).strip() + else: + body = "" + lineno = "?" + m = re.match(r'^([A-Za-z_][A-Za-z0-9_]*)(?:, *)?\(', body) + if m: + inFunc = "%s:%s %s" %(fn,lineno,m.group(1)) + elif body == "}": + if FUNC and inFunc: + show(inFunc, none, some) + none = some = 0 + inFunc = None + if re.match(r'^ *###', line): + none += 1 + elif re.match(r'^ *\d', line): + some += 1 + else: + m = re.match(r'^branch.*taken (\d+)%', line) + if m: + if int(m.group(1)) == 0: + branchNot += 1 + else: + branchTaken += 1 + + none0 += none + some0 += some + branchTaken0 += branchTaken + branchNot0 += branchNot + if FUNC: + pass + elif BRANCH: + if branchTaken or branchNot: + show(fn, branchNot, branchTaken) + else: + if some or none: + show(fn, none, some) + +if BRANCH: + if branchTaken0 or branchNot0: + show("TOTAL", branchNot0, branchTaken0) +else: + if some0 or none0: + show("TOTAL", none0, some0)

1 0

[tor-messenger-build/master] Set Mozilla base to aurora hash
by sukhbir＠torproject.org 16 Jul '15

16 Jul '15

commit 4caa84e3b251edb048e6295ba62e0e731390e7e0 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 16 11:34:27 2015 -0400 Set Mozilla base to aurora hash --- projects/mozilla/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mozilla/config b/projects/mozilla/config index 1301bd5..28d6a6e 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/gecko-dev -git_hash: esr38 +git_hash: aurora src: | #!/bin/sh set -e

1 0

[tor/master] Break some wide lines
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit edaf68173549fe520e273d8e921bd9a00101d174 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 11:11:21 2015 -0400 Break some wide lines --- src/or/ntmain.c | 2 +- src/or/rendcache.h | 6 +++--- src/or/rendservice.c | 5 +++-- src/test/test_crypto.c | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/ntmain.c b/src/or/ntmain.c index 89e26c4..22d381c 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -317,7 +317,7 @@ nt_service_main(void) case CMD_DUMP_CONFIG: case CMD_KEYGEN: log_err(LD_CONFIG, "Unsupported command (--list-fingerprint, " - "--hash-password, --keygen, --dump-config, or --verify-config) " + "--hash-password, --keygen, --dump-config, or --verify-config) " "in NT service."); break; case CMD_RUN_UNITTESTS: diff --git a/src/or/rendcache.h b/src/or/rendcache.h index f33ea66..f61f02a 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -48,9 +48,9 @@ typedef enum { rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc); rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc, - const char *desc_id_base32, - const rend_data_t *rend_query, - rend_cache_entry_t **entry); + const char *desc_id_base32, + const rend_data_t *rend_query, + rend_cache_entry_t **entry); size_t rend_cache_get_total_allocation(void); #endif /* TOR_RENDCACHE_H */ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 74e8a8d..db6bc4b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3147,7 +3147,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, rend_data = rend_data_client_create(service_id, desc->desc_id, NULL, REND_NO_AUTH); directory_initiate_command_routerstatus_rend(hs_dir, - DIR_PURPOSE_UPLOAD_RENDDESC_V2, + DIR_PURPOSE_UPLOAD_RENDDESC_V2, ROUTER_PURPOSE_GENERAL, DIRIND_ANONYMOUS, NULL, desc->desc_str, @@ -3660,7 +3660,8 @@ rend_consider_services_upload(time_t now) } /* Does every introduction points have been established? */ unsigned int intro_points_ready = - count_established_intro_points(service) >= service->n_intro_points_wanted; + count_established_intro_points(service) >= + service->n_intro_points_wanted; if (intro_points_ready && (service->next_upload_time < now || (service->desc_is_dirty && diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 2bc4770..dbaec61 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1838,7 +1838,8 @@ struct testcase_t crypto_tests[] = { { "ed25519_convert", test_crypto_ed25519_convert, 0, NULL, NULL }, { "ed25519_blinding", test_crypto_ed25519_blinding, 0, NULL, NULL }, { "ed25519_testvectors", test_crypto_ed25519_testvectors, 0, NULL, NULL }, - { "ed25519_fuzz_donna", test_crypto_ed25519_fuzz_donna, TT_FORK, NULL, NULL }, + { "ed25519_fuzz_donna", test_crypto_ed25519_fuzz_donna, TT_FORK, NULL, + NULL }, { "siphash", test_crypto_siphash, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Fix most check-spaces issues
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit b5cfcb2045262a3ce9485c4d5a0c91b89174e539 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 11:10:14 2015 -0400 Fix most check-spaces issues --- src/common/compat.c | 4 +++- src/common/crypto_curve25519.c | 2 +- src/common/util.c | 2 +- src/or/config.c | 1 - src/or/rendcache.c | 11 ++++++----- src/or/rendcache.h | 1 + src/or/routerkeys.c | 1 - src/or/routerparse.c | 1 - src/test/test_crypto_slow.c | 10 +++++----- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 07f011d..4930c05 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -80,7 +80,8 @@ wint_t _getwch(void); #define WEOF (wchar_t)(0xFFFF) #endif #if defined(HAVE_DECL_SECUREZEROMEMORY) && !HAVE_DECL_SECUREZEROMEMORY -static inline void SecureZeroMemory(PVOID ptr, SIZE_T cnt) +static inline void +SecureZeroMemory(PVOID ptr, SIZE_T cnt) { volatile char *vcptr = (volatile char*)ptr; while (cnt--) @@ -3378,3 +3379,4 @@ tor_getpass(const char *prompt, char *output, size_t buflen) #error "No implementation for tor_getpass found!" #endif } + diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 113ac89..0437824 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -353,7 +353,7 @@ curve25519_basepoint_spot_check(void) /* Check the most basic possible sanity via the test secret/public key pair * used in "Cryptography in NaCl - 2. Secret keys and public keys". This - * may catch catastrophic failures on systems where Curve25519 is expensive, + * may catch catastrophic failures on systems where Curve25519 is expensive, * without requiring a ton of key generation. */ curve25519_use_ed = 1; diff --git a/src/common/util.c b/src/common/util.c index 1849613..a5b5488 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2561,7 +2561,7 @@ read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) size_t string_max = 0; if (max_bytes_to_read+1 >= SIZE_T_CEILING) { - errno = EINVAL; + errno = EINVAL; return NULL; } diff --git a/src/or/config.c b/src/or/config.c index bd74db6..2f65664 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2591,7 +2591,6 @@ options_validate_cb(void *old_options, void *options, void *default_options, STMT_BEGIN log_warn(LD_CONFIG, args, ##__VA_ARGS__); STMT_END #endif - /** Log a warning message iff filepath is not absolute. * Warning message must contain option name option and * an absolute path that filepath will resolve to. diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 37d3f12..be94ef4 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -237,7 +237,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) *e = entry; } -end: + end: return ret; } @@ -374,9 +374,9 @@ rend_cache_store_v2_desc_as_dir(const char *desc) number_stored++; goto advance; -skip: + skip: rend_service_descriptor_free(parsed); -advance: + advance: /* advance to next descriptor, if available. */ current_desc = next_desc; /* check if there is a next descriptor. */ @@ -566,14 +566,15 @@ rend_cache_store_v2_desc_as_client(const char *desc, } return RCS_OKAY; -okay: + okay: if (entry) { *entry = e; } retval = RCS_OKAY; -err: + err: rend_service_descriptor_free(parsed); tor_free(intro_content); return retval; } + diff --git a/src/or/rendcache.h b/src/or/rendcache.h index f34f599..f33ea66 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -54,3 +54,4 @@ rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc, size_t rend_cache_get_total_allocation(void); #endif /* TOR_RENDCACHE_H */ + diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 955cb9c..47a6c89 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -61,7 +61,6 @@ read_encrypted_secret_key(ed25519_secret_key_t *out, * it right. */ } - if (secret_len != ED25519_SECKEY_LEN) { log_err(LD_OR, "%s is corrupted.", fname); saved_errno = EINVAL; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3904671..c2206f1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4498,7 +4498,6 @@ microdescs_parse_from_string(const char *s, const char *eos, } } - if (tokenize_string(area, s, start_of_next_microdesc, tokens, microdesc_token_table, flags)) { log_warn(LD_DIR, "Unparseable microdescriptor"); diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 2bd76f2..8d6787a 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -172,8 +172,8 @@ test_libscrypt_eq_openssl(void *arg) p = 16; libscrypt_retval = - libscrypt_scrypt((const uint8_t *)"password", 0, - (const uint8_t *)"NaCl", 0, + libscrypt_scrypt((const uint8_t *)"password", 0, + (const uint8_t *)"NaCl", 0, r, N, p, buf1, dk_len); openssl_retval = EVP_PBE_scrypt((const char *)"password", 0, @@ -211,10 +211,10 @@ test_libscrypt_eq_openssl(void *arg) memset(buf2,0,64); r = 1048576; - + libscrypt_retval = - libscrypt_scrypt((const uint8_t *)"pleaseletmein", 0, - (const uint8_t *)"SodiumChloride", 0, + libscrypt_scrypt((const uint8_t *)"pleaseletmein", 0, + (const uint8_t *)"SodiumChloride", 0, N, r, p, buf1, dk_len); openssl_retval = EVP_PBE_scrypt((const char *)"pleaseletmein", 0,

1 0

[torspec/master] Fixes from teor
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 7ba3a0cbc74b11d962d181ab06f688c0ce31fad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 10:20:46 2015 -0400 Fixes from teor --- proposals/248-removing-rsa-identities.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/248-removing-rsa-identities.txt b/proposals/248-removing-rsa-identities.txt index 56b7ffc..81bad3f 100644 --- a/proposals/248-removing-rsa-identities.txt +++ b/proposals/248-removing-rsa-identities.txt @@ -67,7 +67,7 @@ Status: Draft relays by their Ed identity alone. For backward compatibility, we should consider a default that refers - to referring to Ed25519 relays by the first 160 bits of their key. + to Ed25519 relays by the first 160 bits of their key. This would allow many controller-based tools to work transparently with the new key types. @@ -75,8 +75,8 @@ Status: Draft This is the big one. We need a relatively comprehensive list of tools we can break with the above changes. Anything that refers to - relays by SHA1(RSA1024_id) will need to be able to remember and use - an Ed25519 key instead. + relays by SHA1(RSA1024_id) will need to be able to receive, store, + and use an Ed25519 key instead. 5. Testing

1 0

[torspec/master] Fix a mistype, found by Ian.
by nickm＠torproject.org 16 Jul '15

16 Jul '15

commit 85f00718f1b6da4089bede0fe1388abdec42b7ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 16 10:19:28 2015 -0400 Fix a mistype, found by Ian. --- proposals/248-removing-rsa-identities.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/248-removing-rsa-identities.txt b/proposals/248-removing-rsa-identities.txt index 93584c0..56b7ffc 100644 --- a/proposals/248-removing-rsa-identities.txt +++ b/proposals/248-removing-rsa-identities.txt @@ -10,7 +10,7 @@ Status: Draft identity keys are 1024-bit RSA, which should not really be considered adequate. In proposal 220, we describe a migration path to start using Ed25519 keys. This proposal describes an additional migration - path, for finally removing our old Ed25519 keys. + path, for finally removing our old RSA identity keys. See also proposal 245, which describes a migration path away from the old TAP RSA1024-based circuit extension protocol.

1 0

[tor-messenger-build/master] Remove osx-saved-application-state.patch merged upstream
by sukhbir＠torproject.org 16 Jul '15

16 Jul '15

commit f4e120027cf7ae7e08a14a01b2a09405d44739bd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 16 08:28:22 2015 -0400 Remove osx-saved-application-state.patch merged upstream --- projects/instantbird/config | 2 -- .../instantbird/osx-saved-application-state.patch | 26 -------------------- 2 files changed, 28 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 9cd0343..e23de89 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,8 +105,6 @@ input_files: - filename: branding/about.png - filename: branding/osx.patch enable: '[% c("var/osx") %]' - - filename: osx-saved-application-state.patch - enable: '[% c("var/osx") %]' - filename: cert-installer.patch enable: '[% c("var/osx") %]' - filename: cert_override.txt diff --git a/projects/instantbird/osx-saved-application-state.patch b/projects/instantbird/osx-saved-application-state.patch deleted file mode 100644 index e92e6f7..0000000 --- a/projects/instantbird/osx-saved-application-state.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1436500709 25200 -# Thu Jul 09 20:58:29 2015 -0700 -# Node ID 1464e4f7b9d0578859a3c25b55b096be83c782a7 -# Parent dfe08be4ec2350ca30eb7bc9f95f0ab363f25a10 -Set NSDisablePersistence to prevent disk leaks. - -diff --git a/im/app/macbuild/Contents/Info.plist.in b/im/app/macbuild/Contents/Info.plist.in ---- a/im/app/macbuild/Contents/Info.plist.in -+++ b/im/app/macbuild/Contents/Info.plist.in -@@ -25,12 +25,14 @@ - <key>CFBundleVersion</key> - <string>%APP_VERSION%</string> - <key>NSAppleScriptEnabled</key> - <true/> - <key>LSMinimumSystemVersion</key> - <string>10.6.0</string> - <key>NSSupportsAutomaticGraphicsSwitching</key> - <true/> -+ <key>NSDisablePersistence</key> -+ <true/> - <key>NSPrincipalClass</key> - <string>GeckoNSApplication</string> - </dict> - </plist>

1 0