[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6fed66d268fa84bff7c68eb549907546b66ca6f8 Merge: a4e8f9450 12258bbb9 Author: David Goulet Date: Tue Jul 3 13:31:08 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 3c97b148a42f6863ccf4b950967ce345d2fc8cbe Merge: ed84dab8b 2968c716d Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a
Merge: 6e9d5fc4e a3ec89a4f
Author: Nick Mathewson
Date: Fri Jun 29 13:49:43 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/test/test_channelpadding.c | 1 +
src/test/test_hs_descriptor.c | 3 +++
src/test/test_shared_random.c | 1 +
3 files changed, 5 insertions(+)
diff --cc src/test/test_hs_descriptor.c
index a5e9b9667,a40616c61..897b44188
--- a/src/test/test_hs_descriptor.c
+++ b/src/test/test_hs_descriptor.c
@@@ -196,18 -195,19 +196,19 @@@ test_link_specifier(void *arg
/* Decode it and validate the format. */
ret = base64_decode(buf, sizeof(buf), b64, strlen(b64));
-tt_int_op(ret, >, 0);
+tt_int_op(ret, OP_GT, 0);
/* First byte is the number of link specifier. */
-tt_int_op(get_uint8(buf), ==, 1);
+tt_int_op(get_uint8(buf), OP_EQ, 1);
ret = link_specifier_parse(, (uint8_t *) buf + 1, ret - 1);
-tt_int_op(ret, ==, 8);
+tt_int_op(ret, OP_EQ, 8);
/* Should be 2 bytes for port and 4 bytes for IPv4. */
-tt_int_op(link_specifier_get_ls_len(ls), ==, 6);
+tt_int_op(link_specifier_get_ls_len(ls), OP_EQ, 6);
ipv4 = link_specifier_get_un_ipv4_addr(ls);
-tt_int_op(tor_addr_to_ipv4h(), ==, ipv4);
-tt_int_op(link_specifier_get_un_ipv4_port(ls), ==, spec.u.ap.port);
+tt_int_op(tor_addr_to_ipv4h(), OP_EQ, ipv4);
+tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
+ ls = NULL;
tor_free(b64);
}
@@@ -233,11 -233,11 +234,12 @@@
for (unsigned int i = 0; i < sizeof(ipv6); i++) {
ipv6[i] = link_specifier_get_un_ipv6_addr(ls, i);
}
-tt_mem_op(tor_addr_to_in6_addr8(), ==, ipv6, sizeof(ipv6));
-tt_int_op(link_specifier_get_un_ipv6_port(ls), ==, spec.u.ap.port);
+tt_mem_op(tor_addr_to_in6_addr8(), OP_EQ, ipv6,
+ sizeof(ipv6));
+tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
+ ls = NULL;
tor_free(b64);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 68dfbd5ef433b830059baa08d48589518db05d22 Merge: fe2588a5a ea14d3408 Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26467| 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c | 1 + src/test/hs_test_helpers.c | 6 ++ src/test/test_channelpadding.c | 2 ++ src/test/test_hs_descriptor.c | 11 +-- 6 files changed, 18 insertions(+), 6 deletions(-) diff --cc src/or/hs_descriptor.c index fef0607c1,8e10c0fff..582ac9cb7 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@@ -1115,16 -1133,8 +1115,17 @@@ decode_link_specifiers(const char *enco memcpy(hs_spec->u.legacy_id, link_specifier_getarray_un_legacy_id(ls), sizeof(hs_spec->u.legacy_id)); break; +case LS_ED25519_ID: + /* Both are known at compile time so let's make sure they are the same + * else we can copy memory out of bound. */ + tor_assert(link_specifier_getlen_un_ed25519_id(ls) == + sizeof(hs_spec->u.ed25519_id)); + memcpy(hs_spec->u.ed25519_id, + link_specifier_getconstarray_un_ed25519_id(ls), + sizeof(hs_spec->u.ed25519_id)); + break; default: + tor_free(hs_spec); goto err; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit fe2588a5a8560c8cb03345b3caaaf906655c34a1 Merge: 25226fb26 1385a5118 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7 +-- src/test/test_shared_random.c | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 25226fb260a6b5f93187b707ec35f06637fbe710 Merge: 6107a2127 d6d3f8486 Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/feature26372_029 | 4 configure.ac | 6 +- 2 files changed, 9 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
