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

[tor/master] Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41'
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 5b5abd8c038b88cba7078a105b0896cd151ee509 Merge: a1019b8 110765f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 8 15:08:28 2016 -0800 Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41' changes/feature17951 | 6 ++++++ src/common/address.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-)

1 0

[tor/master] Always test both ed25519 backends.
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit b18f533cf06188607d444daa50974a6fc836f82d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 23 09:16:26 2015 -0500 Always test both ed25519 backends. Part of #16794 --- changes/bug16794_ed | 3 +++ src/common/crypto_ed25519.c | 22 ++++++++++++++++++++++ src/common/crypto_ed25519.h | 5 +++++ src/test/test_crypto.c | 42 ++++++++++++++++++++++++++++++++++-------- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/… [View More]changes/bug16794_ed b/changes/bug16794_ed new file mode 100644 index 0000000..a43c401 --- /dev/null +++ b/changes/bug16794_ed @@ -0,0 +1,3 @@ + o Testing: + - Always test both ed25519 backends, so that we can be sure that + our batch-open replacement code works. Part of ticket 16794. diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 41ec486..9df665f 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -96,6 +96,28 @@ get_ed_impl(void) return ed25519_impl; } +#ifdef TOR_UNIT_TESTS +static const ed25519_impl_t *saved_ed25519_impl = NULL; +void +crypto_ed25519_testing_force_impl(const char *name) +{ + tor_assert(saved_ed25519_impl == NULL); + saved_ed25519_impl = ed25519_impl; + if (! strcmp(name, "donna")) { + ed25519_impl = &impl_donna; + } else { + tor_assert(!strcmp(name, "ref10")); + ed25519_impl = &impl_ref10; + } +} +void +crypto_ed25519_testing_restore_impl(void) +{ + ed25519_impl = saved_ed25519_impl; + saved_ed25519_impl = NULL; +} +#endif + /** * Initialize a new ed25519 secret key in <b>seckey_out</b>. If * <b>extra_strong</b>, take the RNG inputs directly from the operating diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h index bdac12e..4fa7ea1 100644 --- a/src/common/crypto_ed25519.h +++ b/src/common/crypto_ed25519.h @@ -111,5 +111,10 @@ int ed25519_pubkey_eq(const ed25519_public_key_t *key1, void ed25519_set_impl_params(int use_donna); void ed25519_init(void); +#ifdef TOR_UNIT_TESTS +void crypto_ed25519_testing_force_impl(const char *name); +void crypto_ed25519_testing_restore_impl(void); +#endif + #endif diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index e343779..b57aaf6 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1688,6 +1688,25 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); } +static void * +ed25519_testcase_setup(const struct testcase_t *testcase) +{ + crypto_ed25519_testing_force_impl(testcase->setup_data); + return testcase->setup_data; +} +static int +ed25519_testcase_cleanup(const struct testcase_t *testcase, void *ptr) +{ + (void)testcase; + (void)ptr; + crypto_ed25519_testing_restore_impl(); + return 1; +} +static const struct testcase_setup_t ed25519_test_setup = { + ed25519_testcase_setup, ed25519_testcase_cleanup +}; + + static void test_crypto_ed25519_simple(void *arg) { @@ -2327,6 +2346,14 @@ test_crypto_failure_modes(void *arg) #define CRYPTO_LEGACY(name) \ { #name, test_crypto_ ## name , 0, NULL, NULL } +#define ED25519_TEST_ONE(name, fl, which) \ + { #name "/ed25519_" which, test_crypto_ed25519_ ## name, (fl), \ + &ed25519_test_setup, (void*)which } + +#define ED25519_TEST(name, fl) \ + ED25519_TEST_ONE(name, (fl), "donna"), \ + ED25519_TEST_ONE(name, (fl), "ref10") + struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), CRYPTO_LEGACY(rng), @@ -2355,14 +2382,13 @@ struct testcase_t crypto_tests[] = { { "curve25519_wrappers", test_crypto_curve25519_wrappers, 0, NULL, NULL }, { "curve25519_encode", test_crypto_curve25519_encode, 0, NULL, NULL }, { "curve25519_persist", test_crypto_curve25519_persist, 0, NULL, NULL }, - { "ed25519_simple", test_crypto_ed25519_simple, 0, NULL, NULL }, - { "ed25519_test_vectors", test_crypto_ed25519_test_vectors, 0, NULL, NULL }, - { "ed25519_encode", test_crypto_ed25519_encode, 0, NULL, NULL }, - { "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_TEST(simple, 0), + ED25519_TEST(test_vectors, 0), + ED25519_TEST(encode, 0), + ED25519_TEST(convert, 0), + ED25519_TEST(blinding, 0), + ED25519_TEST(testvectors, 0), + ED25519_TEST(fuzz_donna, TT_FORK), { "siphash", test_crypto_siphash, 0, NULL, NULL }, { "failure_modes", test_crypto_failure_modes, TT_FORK, NULL, NULL }, END_OF_TESTCASES [View Less]

1 0

[tor/master] Disable the dynlock functions we were giving openssl.
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 63658598250a906346d260c70678700e22c0fe01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 23 09:58:36 2015 -0500 Disable the dynlock functions we were giving openssl. OpenSSL doesn't use them, and fwict they were never called. If some version of openssl *does* start using them, we should test them before we turn them back on. See ticket 17926 --- changes/17926 | 3 +++ src/common/crypto.c | 7 +++++++ 2 files changed, 10 … [View More]

1 0

[tor/master] Unit tests for crypto_force_rand_ssleay().
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit d7c841f4679521d423eb029d7307f10e15dbe133 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 23 09:58:08 2015 -0500 Unit tests for crypto_force_rand_ssleay(). Part of 16794. --- src/common/crypto.c | 2 +- src/common/crypto.h | 4 ++++ src/test/test_crypto.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 251bbbf..22d938f 100644 --- a/src/… [View More]common/crypto.c +++ b/src/common/crypto.c @@ -252,7 +252,7 @@ crypto_openssl_get_header_version_str(void) /** Make sure that openssl is using its default PRNG. Return 1 if we had to * adjust it; 0 otherwise. */ -static int +STATIC int crypto_force_rand_ssleay(void) { RAND_METHOD *default_method; diff --git a/src/common/crypto.h b/src/common/crypto.h index cf7b9ee..ad779f5 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -314,5 +314,9 @@ struct dh_st *crypto_dh_get_dh_(crypto_dh_t *dh); void crypto_add_spaces_to_fp(char *out, size_t outlen, const char *in); +#ifdef CRYPTO_PRIVATE +STATIC int crypto_force_rand_ssleay(void); +#endif + #endif diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index b57aaf6..b3e0e1b 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -5,6 +5,7 @@ #include "orconfig.h" #define CRYPTO_CURVE25519_PRIVATE +#define CRYPTO_PRIVATE #include "or.h" #include "test.h" #include "aes.h" @@ -15,6 +16,7 @@ #include "ed25519_vectors.inc" #include <openssl/evp.h> +#include <openssl/rand.h> extern const char AUTHORITY_SIGNKEY_3[]; extern const char AUTHORITY_SIGNKEY_A_DIGEST[]; @@ -131,6 +133,32 @@ test_crypto_rng_range(void *arg) ; } +/* Test for rectifying openssl RAND engine. */ +static void +test_crypto_rng_engine(void *arg) +{ + (void)arg; + RAND_METHOD dummy_method; + memset(&dummy_method, 0, sizeof(dummy_method)); + + /* We should be a no-op if we're already on RAND_OpenSSL */ + tt_int_op(0, ==, crypto_force_rand_ssleay()); + tt_assert(RAND_get_rand_method() == RAND_OpenSSL()); + + /* We should correct the method if it's a dummy. */ + RAND_set_rand_method(&dummy_method); + tt_assert(RAND_get_rand_method() == &dummy_method); + tt_int_op(1, ==, crypto_force_rand_ssleay()); + tt_assert(RAND_get_rand_method() == RAND_OpenSSL()); + + /* Make sure we aren't calling dummy_method */ + crypto_rand((void *) &dummy_method, sizeof(dummy_method)); + crypto_rand((void *) &dummy_method, sizeof(dummy_method)); + + done: + ; +} + /** Run unit tests for our AES functionality */ static void test_crypto_aes(void *arg) @@ -2358,6 +2386,7 @@ struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), CRYPTO_LEGACY(rng), { "rng_range", test_crypto_rng_range, 0, NULL, NULL }, + { "rng_engine", test_crypto_rng_engine, TT_FORK, NULL, NULL }, { "aes_AES", test_crypto_aes, TT_FORK, &passthrough_setup, (void*)"aes" }, { "aes_EVP", test_crypto_aes, TT_FORK, &passthrough_setup, (void*)"evp" }, CRYPTO_LEGACY(sha), [View Less]

1 0

[tor/master] Merge remote-tracking branch 'public/feature16794_more'
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit a1019b82c1e26f0fb925bfc9ae55d213be579a90 Merge: 4c10a9c 6365859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 8 14:54:51 2016 -0800 Merge remote-tracking branch 'public/feature16794_more' changes/17926 | 3 ++ changes/bug16794_ed | 3 ++ src/common/crypto.c | 9 +++++- src/common/crypto.h | 4 +++ src/common/crypto_ed25519.c | 22 ++++++++++++++ src/common/crypto_ed25519.h | 5 +++ src/test/test_crypto.… [View More]

1 0

[tor/master] Simplify micro-revision dependency rules
by nickm＠torproject.org 08 Jan '16

08 Jan '16

commit 4c10a9c445e825886c658d67f5e44fdae37ffea3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jan 8 13:05:46 2016 +0100 Simplify micro-revision dependency rules The Automake variable OBJEXT is automatically adjusted to the correct object file extension for the target platform. --- src/common/include.am | 6 ++---- src/or/include.am | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/common/include.am b/src/common/… [View More]

1 0

[globe/master] Switch to new effective and alleged family fields, and notice the difference between them
by isis＠torproject.org 08 Jan '16

08 Jan '16

commit 67a74642e6ab1838ee4e2a00a5b4c262e1465a5f Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Thu Sep 10 15:52:02 2015 -0300 Switch to new effective and alleged family fields, and notice the difference between them --- src/css/new-style.css | 4 ++++ src/js/models/OnionooDetail.js | 8 ++++++++ src/js/models/defaults.js | 6 ++++-- src/js/templates/relayDetail.hbs | 13 +++++++++---- 4 files changed, 25 insertions(+), 6 deletions(-) diff --… [View More]git a/src/css/new-style.css b/src/css/new-style.css index 34bac6e..58e2cda 100644 --- a/src/css/new-style.css +++ b/src/css/new-style.css @@ -456,6 +456,10 @@ code { background-color: #f7f7f7; } .item-list li:last-of-type { border-bottom: 0; } + .item-list li.alleged { + background-color: #ffe2c9; } + .item-list li.alleged:nth-child(even) { + background-color: #ffefe0; } .flags-list i.fa { margin-right: 10px; } diff --git a/src/js/models/OnionooDetail.js b/src/js/models/OnionooDetail.js index f229d90..6f4db42 100644 --- a/src/js/models/OnionooDetail.js +++ b/src/js/models/OnionooDetail.js @@ -27,6 +27,7 @@ GLOBE.OnionooDetail.reopenClass({ var relay = $.extend({}, defaults.relay, result.relays[i]); var relayObj = GLOBE.OnionooRelayDetail.create(relay); var relayLastSeenMoment = moment.utc(relayObj.get('last_seen')); + var emptyFamily = true; // check if consensus.relays and lastSeenMoment exist if ( consensus.relays && relayLastSeenMoment && @@ -34,6 +35,13 @@ GLOBE.OnionooDetail.reopenClass({ consensus.relays.isValid() && relayLastSeenMoment.isValid()) { relayObj.set('inLatestConsensus', consensus.relays.isSame(relayLastSeenMoment)); } + + // family field is replaced by the union of both effective and alleged family fields + if( relayObj.effective_family.length > 0 || relayObj.alleged_family.length > 0 ) { + emptyFamily = false; + } + + relayObj.set('emptyFamily', emptyFamily); details.relays.push(relayObj); diff --git a/src/js/models/defaults.js b/src/js/models/defaults.js index d5c2c29..667bb1f 100644 --- a/src/js/models/defaults.js +++ b/src/js/models/defaults.js @@ -23,7 +23,7 @@ GLOBE.defaults.OnionooBridgeDetail = { /** * default relay detail object * @see {@link https://onionoo.torproject.org/#details} - * @type {{nickname: string, fingerprint: string, hashed_fingerprint: string, or_addresses: Array, exit_addresses: Array, dir_address: string, last_seen: string, last_changed_address_or_port: string, first_seen: string, running: null, flags: Array, country: string, country_name: string, region_name: string, city_name: string, latitude: number, longitude: number, as_number: string, as_name: string, consensus_weight: number, host_name: string, last_restarted: string, bandwidth_rate: number, bandwidth_burst: number, observed_bandwidth: number, advertised_bandwidth: number, exit_policy: Array, exit_policy_summary: Array, contact: string, platform: string, family: Array, advertised_bandwidth_fraction: number, consensus_weight_fraction: number, guard_probability: number, middle_probability: number, exit_probability: number}} + * @type {{nickname: string, fingerprint: string, hashed_fingerprint: string, or_addresses: Array, exit_addresses: Array, dir_address: string, last_seen: string, last_changed_address_or_port: string, first_seen: string, running: null, flags: Array, country: string, country_name: string, region_name: string, city_name: string, latitude: number, longitude: number, as_number: string, as_name: string, consensus_weight: number, host_name: string, last_restarted: string, bandwidth_rate: number, bandwidth_burst: number, observed_bandwidth: number, advertised_bandwidth: number, exit_policy: Array, exit_policy_summary: Array, contact: string, platform: string, family: Array (deprecated), effective_family: Array, alleged_family: Array, advertised_bandwidth_fraction: number, consensus_weight_fraction: number, guard_probability: number, middle_probability: number, exit_probability: number}} */ GLOBE.defaults.OnionooRelayDetail = { nickname: 'Unnamed', @@ -59,6 +59,8 @@ GLOBE.defaults.OnionooRelayDetail = { contact: '', platform: '', family: [], + effective_family: [], + alleged_family: [], advertised_bandwidth_fraction: -1, consensus_weight_fraction: -1, guard_probability: -1, @@ -78,4 +80,4 @@ GLOBE.defaults.History = { factor: 1, count: 0, values: [] -}; \ No newline at end of file +}; diff --git a/src/js/templates/relayDetail.hbs b/src/js/templates/relayDetail.hbs index 1e9e449..ea7d133 100644 --- a/src/js/templates/relayDetail.hbs +++ b/src/js/templates/relayDetail.hbs @@ -171,11 +171,16 @@ title="Other family members of this relay.">Family Members</h5> <div class="property-content"> <ul class="item-list"> - {{#each family}} - <li><i {{action 'visitFamilyMember' this}} title="open family member details" class="button fa fa-external-link-square"></i> {{unbound familyToFingerprint this }}</li> - {{else}} + {{#if emptyFamily}} <li>none</li> - {{/each}} + {{else}} + {{#each effective_family}} + <li><i {{action 'visitFamilyMember' this}} title="open family member details" class="button fa fa-external-link-square"></i> {{unbound familyToFingerprint this }}</li> + {{/each}} + {{#each alleged_family}} + <li class="alleged"><i {{action 'visitFamilyMember' this}} title="open (alleged) family member details" class="button fa fa-external-link-square"></i> {{unbound familyToFingerprint this }}</li> + {{/each}} + {{/if}} </ul> </div> </div> [View Less]

1 0

[globe/master] Removed family field, and added effective and alleged family in unit tests
by isis＠torproject.org 08 Jan '16

08 Jan '16

commit 9815a16bfff5c42eb6d1d97690ea09012c455f25 Author: orlando <cristobal.leiva(a)usach.cl> Date: Sat Nov 28 20:24:04 2015 -0300 Removed family field, and added effective and alleged family in unit tests --- test/unit/onionoodetail.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/onionoodetail.test.js b/test/unit/onionoodetail.test.js index 3ac9733..c241abf 100644 --- a/test/unit/onionoodetail.test.js +++ b/test/unit/onionoodetail.test.js … [View More]

1 0

[globe/master] Removed deprecated family field
by isis＠torproject.org 08 Jan '16

08 Jan '16

commit d0c2f61c8c93e4c0c5573f9abfc3df45fad304c3 Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Fri Sep 11 17:31:49 2015 -0300 Removed deprecated family field --- src/js/models/defaults.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/models/defaults.js b/src/js/models/defaults.js index 667bb1f..1685a99 100644 --- a/src/js/models/defaults.js +++ b/src/js/models/defaults.js @@ -23,7 +23,7 @@ GLOBE.defaults.OnionooBridgeDetail = { /** * … [View More]default relay detail object * @see {@link https://onionoo.torproject.org/#details} - * @type {{nickname: string, fingerprint: string, hashed_fingerprint: string, or_addresses: Array, exit_addresses: Array, dir_address: string, last_seen: string, last_changed_address_or_port: string, first_seen: string, running: null, flags: Array, country: string, country_name: string, region_name: string, city_name: string, latitude: number, longitude: number, as_number: string, as_name: string, consensus_weight: number, host_name: string, last_restarted: string, bandwidth_rate: number, bandwidth_burst: number, observed_bandwidth: number, advertised_bandwidth: number, exit_policy: Array, exit_policy_summary: Array, contact: string, platform: string, family: Array (deprecated), effective_family: Array, alleged_family: Array, advertised_bandwidth_fraction: number, consensus_weight_fraction: number, guard_probability: number, middle_probability: number, exit_probability: number}} + * @type {{nickname: string, fingerprint: string, hashed_fingerprint: string, or_addresses: Array, exit_addresses: Array, dir_address: string, last_seen: string, last_changed_address_or_port: string, first_seen: string, running: null, flags: Array, country: string, country_name: string, region_name: string, city_name: string, latitude: number, longitude: number, as_number: string, as_name: string, consensus_weight: number, host_name: string, last_restarted: string, bandwidth_rate: number, bandwidth_burst: number, observed_bandwidth: number, advertised_bandwidth: number, exit_policy: Array, exit_policy_summary: Array, contact: string, platform: string, effective_family: Array, alleged_family: Array, advertised_bandwidth_fraction: number, consensus_weight_fraction: number, guard_probability: number, middle_probability: number, exit_probability: number}} */ GLOBE.defaults.OnionooRelayDetail = { nickname: 'Unnamed', @@ -58,7 +58,6 @@ GLOBE.defaults.OnionooRelayDetail = { exit_policy_summary: [], contact: '', platform: '', - family: [], effective_family: [], alleged_family: [], advertised_bandwidth_fraction: -1, [View Less]

1 0

[globe/master] Merge remote-tracking branch 'leivaburto/task-16962'
by isis＠torproject.org 08 Jan '16

08 Jan '16

commit 6b13846efbef46ed2736ef06a57abff3fdf1fda5 Merge: 9673022 9815a16 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 8 21:19:23 2016 +0000 Merge remote-tracking branch 'leivaburto/task-16962' src/css/new-style.css | 4 ++++ src/js/models/OnionooDetail.js | 8 ++++++++ src/js/models/defaults.js | 7 ++++--- src/js/templates/relayDetail.hbs | 13 +++++++++---- test/unit/onionoodetail.test.js | 3 ++- 5 files changed, 27 insertions(+), 8 deletions(-)

1 0