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

[tor-messenger-build/updater] Fix typo in changelog
by sukhbir＠torproject.org 07 Sep '16

07 Sep '16

commit 8b3de3fc0e60928889efe6a316af78d5011ffbf4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Sep 6 12:36:15 2016 -0400 Fix typo in changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f612957..e4f5546 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.2.0b2 -- September 06, 2016 * Mac * Bug 19269: Fix OS X file permissions - * Fix OS X profile when not application not placed in /Applications + * Fix OS X profile when application is not placed in /Applications Tor Messenger 0.2.0b1 -- September 02, 2016 * All Platforms

1 0

[tor/master] Split tor_parse_{some_int} testing into separate fn. Code movement only.
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 7ba47ca1fd7135fc9860caa70fc9ef7645f75950 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:25:54 2016 -0400 Split tor_parse_{some_int} testing into separate fn. Code movement only. --- src/test/test_util.c | 246 +++++++++++++++++++++++++++------------------------ 1 file changed, 128 insertions(+), 118 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6839db9..6836c01 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1723,8 +1723,7 @@ static void test_util_strmisc(void *arg) { char buf[1024]; - int i; - char *cp, *cp_tmp = NULL; + char *cp_tmp = NULL; /* Test strl operations */ (void)arg; @@ -1749,122 +1748,6 @@ test_util_strmisc(void *arg) tor_strstrip(buf, "!? "); tt_str_op(buf,OP_EQ, "Testing123"); - /* Test parse_long */ - /* Empty/zero input */ - tt_int_op(0L,OP_EQ, tor_parse_long("",10,0,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - tt_int_op(0L,OP_EQ, tor_parse_long("0",10,0,100,&i,NULL)); - tt_int_op(1,OP_EQ, i); - /* Normal cases */ - tt_int_op(10L,OP_EQ, tor_parse_long("10",10,0,100,&i,NULL)); - tt_int_op(1,OP_EQ, i); - tt_int_op(10L,OP_EQ, tor_parse_long("10",10,0,10,&i,NULL)); - tt_int_op(1,OP_EQ, i); - tt_int_op(10L,OP_EQ, tor_parse_long("10",10,10,100,&i,NULL)); - tt_int_op(1,OP_EQ, i); - tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-100,100,&i,NULL)); - tt_int_op(1,OP_EQ, i); - tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-100,0,&i,NULL)); - tt_int_op(1,OP_EQ, i); - tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-50,0,&i,NULL)); - tt_int_op(1,OP_EQ, i); - /* Extra garbage */ - tt_int_op(0L,OP_EQ, tor_parse_long("10m",10,0,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - tt_int_op(0L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - tt_int_op(10L,OP_EQ, tor_parse_long("10m",10,0,100,&i,&cp)); - tt_int_op(1,OP_EQ, i); - tt_str_op(cp,OP_EQ, "m"); - tt_int_op(-50L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,&cp)); - tt_int_op(1,OP_EQ, i); - tt_str_op(cp,OP_EQ, " plus garbage"); - /* Illogical min max */ - tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,4,&i,NULL)); - tt_int_op(0,OP_EQ, i); - tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,100,-100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - /* Out of bounds */ - tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,0,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - /* Base different than 10 */ - tt_int_op(2L,OP_EQ, tor_parse_long("10",2,0,100,NULL,NULL)); - tt_int_op(0L,OP_EQ, tor_parse_long("2",2,0,100,NULL,NULL)); - tt_int_op(0L,OP_EQ, tor_parse_long("10",-2,0,100,NULL,NULL)); - tt_int_op(68284L,OP_EQ, tor_parse_long("10abc",16,0,70000,NULL,NULL)); - tt_int_op(68284L,OP_EQ, tor_parse_long("10ABC",16,0,70000,NULL,NULL)); - tt_int_op(0,OP_EQ, tor_parse_long("10ABC",-1,0,70000,&i,NULL)); - tt_int_op(i,OP_EQ, 0); - - /* Test parse_ulong */ - tt_int_op(0UL,OP_EQ, tor_parse_ulong("",10,0,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("0",10,0,100,NULL,NULL)); - tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,0,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("10",10,50,100,NULL,NULL)); - tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,0,10,NULL,NULL)); - tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,10,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("8",8,0,100,NULL,NULL)); - tt_int_op(50UL,OP_EQ, tor_parse_ulong("50",10,50,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("-50",10,-100,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("50",-1,50,100,&i,NULL)); - tt_int_op(0,OP_EQ, i); - - /* Test parse_uint64 */ - tt_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp)); - tt_int_op(1,OP_EQ, i); - tt_str_op(cp,OP_EQ, " x"); - tt_assert(U64_LITERAL(12345678901) == - tor_parse_uint64("12345678901",10,0,UINT64_MAX, &i, &cp)); - tt_int_op(1,OP_EQ, i); - tt_str_op(cp,OP_EQ, ""); - tt_assert(U64_LITERAL(0) == - tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp)); - tt_int_op(0,OP_EQ, i); - tt_assert(U64_LITERAL(0) == - tor_parse_uint64("123",-1,0,INT32_MAX, &i, &cp)); - tt_int_op(0,OP_EQ, i); - - { - /* Test parse_double */ - double d = tor_parse_double("10", 0, (double)UINT64_MAX,&i,NULL); - tt_int_op(1,OP_EQ, i); - tt_assert(DBL_TO_U64(d) == 10); - d = tor_parse_double("0", 0, (double)UINT64_MAX,&i,NULL); - tt_int_op(1,OP_EQ, i); - tt_assert(DBL_TO_U64(d) == 0); - d = tor_parse_double(" ", 0, (double)UINT64_MAX,&i,NULL); - tt_int_op(0,OP_EQ, i); - d = tor_parse_double(".0a", 0, (double)UINT64_MAX,&i,NULL); - tt_int_op(0,OP_EQ, i); - d = tor_parse_double(".0a", 0, (double)UINT64_MAX,&i,&cp); - tt_int_op(1,OP_EQ, i); - d = tor_parse_double("-.0", 0, (double)UINT64_MAX,&i,NULL); - tt_int_op(1,OP_EQ, i); - tt_assert(DBL_TO_U64(d) == 0); - d = tor_parse_double("-10", -100.0, 100.0,&i,NULL); - tt_int_op(1,OP_EQ, i); - tt_double_op(fabs(d - -10.0),OP_LT, 1E-12); - } - - { - /* Test tor_parse_* where we overflow/underflow the underlying type. */ - /* This string should overflow 64-bit ints. */ -#define TOOBIG "100000000000000000000000000" - tt_int_op(0L, OP_EQ, - tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); - tt_int_op(i,OP_EQ, 0); - tt_int_op(0L,OP_EQ, - tor_parse_long("-"TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); - tt_int_op(i,OP_EQ, 0); - tt_int_op(0UL,OP_EQ, tor_parse_ulong(TOOBIG, 10, 0, ULONG_MAX, &i, NULL)); - tt_int_op(i,OP_EQ, 0); - tt_u64_op(U64_LITERAL(0), OP_EQ, tor_parse_uint64(TOOBIG, 10, - 0, UINT64_MAX, &i, NULL)); - tt_int_op(i,OP_EQ, 0); - } - /* Test snprintf */ /* Returning -1 when there's not enough room in the output buffer */ tt_int_op(-1,OP_EQ, tor_snprintf(buf, 0, "Foo")); @@ -2054,6 +1937,132 @@ test_util_strmisc(void *arg) } static void +test_util_parse_integer(void *arg) +{ + (void)arg; + int i; + char *cp; + + /* Test parse_long */ + /* Empty/zero input */ + tt_int_op(0L,OP_EQ, tor_parse_long("",10,0,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(0L,OP_EQ, tor_parse_long("0",10,0,100,&i,NULL)); + tt_int_op(1,OP_EQ, i); + /* Normal cases */ + tt_int_op(10L,OP_EQ, tor_parse_long("10",10,0,100,&i,NULL)); + tt_int_op(1,OP_EQ, i); + tt_int_op(10L,OP_EQ, tor_parse_long("10",10,0,10,&i,NULL)); + tt_int_op(1,OP_EQ, i); + tt_int_op(10L,OP_EQ, tor_parse_long("10",10,10,100,&i,NULL)); + tt_int_op(1,OP_EQ, i); + tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-100,100,&i,NULL)); + tt_int_op(1,OP_EQ, i); + tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-100,0,&i,NULL)); + tt_int_op(1,OP_EQ, i); + tt_int_op(-50L,OP_EQ, tor_parse_long("-50",10,-50,0,&i,NULL)); + tt_int_op(1,OP_EQ, i); + /* Extra garbage */ + tt_int_op(0L,OP_EQ, tor_parse_long("10m",10,0,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(0L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(10L,OP_EQ, tor_parse_long("10m",10,0,100,&i,&cp)); + tt_int_op(1,OP_EQ, i); + tt_str_op(cp,OP_EQ, "m"); + tt_int_op(-50L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,&cp)); + tt_int_op(1,OP_EQ, i); + tt_str_op(cp,OP_EQ, " plus garbage"); + /* Illogical min max */ + tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,4,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,100,-100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + /* Out of bounds */ + tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,0,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + /* Base different than 10 */ + tt_int_op(2L,OP_EQ, tor_parse_long("10",2,0,100,NULL,NULL)); + tt_int_op(0L,OP_EQ, tor_parse_long("2",2,0,100,NULL,NULL)); + tt_int_op(0L,OP_EQ, tor_parse_long("10",-2,0,100,NULL,NULL)); + tt_int_op(68284L,OP_EQ, tor_parse_long("10abc",16,0,70000,NULL,NULL)); + tt_int_op(68284L,OP_EQ, tor_parse_long("10ABC",16,0,70000,NULL,NULL)); + tt_int_op(0,OP_EQ, tor_parse_long("10ABC",-1,0,70000,&i,NULL)); + tt_int_op(i,OP_EQ, 0); + + /* Test parse_ulong */ + tt_int_op(0UL,OP_EQ, tor_parse_ulong("",10,0,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("0",10,0,100,NULL,NULL)); + tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,0,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("10",10,50,100,NULL,NULL)); + tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,0,10,NULL,NULL)); + tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,10,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("8",8,0,100,NULL,NULL)); + tt_int_op(50UL,OP_EQ, tor_parse_ulong("50",10,50,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("-50",10,-100,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("50",-1,50,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); + + /* Test parse_uint64 */ + tt_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp)); + tt_int_op(1,OP_EQ, i); + tt_str_op(cp,OP_EQ, " x"); + tt_assert(U64_LITERAL(12345678901) == + tor_parse_uint64("12345678901",10,0,UINT64_MAX, &i, &cp)); + tt_int_op(1,OP_EQ, i); + tt_str_op(cp,OP_EQ, ""); + tt_assert(U64_LITERAL(0) == + tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp)); + tt_int_op(0,OP_EQ, i); + tt_assert(U64_LITERAL(0) == + tor_parse_uint64("123",-1,0,INT32_MAX, &i, &cp)); + tt_int_op(0,OP_EQ, i); + + { + /* Test parse_double */ + double d = tor_parse_double("10", 0, (double)UINT64_MAX,&i,NULL); + tt_int_op(1,OP_EQ, i); + tt_assert(DBL_TO_U64(d) == 10); + d = tor_parse_double("0", 0, (double)UINT64_MAX,&i,NULL); + tt_int_op(1,OP_EQ, i); + tt_assert(DBL_TO_U64(d) == 0); + d = tor_parse_double(" ", 0, (double)UINT64_MAX,&i,NULL); + tt_int_op(0,OP_EQ, i); + d = tor_parse_double(".0a", 0, (double)UINT64_MAX,&i,NULL); + tt_int_op(0,OP_EQ, i); + d = tor_parse_double(".0a", 0, (double)UINT64_MAX,&i,&cp); + tt_int_op(1,OP_EQ, i); + d = tor_parse_double("-.0", 0, (double)UINT64_MAX,&i,NULL); + tt_int_op(1,OP_EQ, i); + tt_assert(DBL_TO_U64(d) == 0); + d = tor_parse_double("-10", -100.0, 100.0,&i,NULL); + tt_int_op(1,OP_EQ, i); + tt_double_op(fabs(d - -10.0),OP_LT, 1E-12); + } + + { + /* Test tor_parse_* where we overflow/underflow the underlying type. */ + /* This string should overflow 64-bit ints. */ +#define TOOBIG "100000000000000000000000000" + tt_int_op(0L, OP_EQ, + tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + tt_int_op(i,OP_EQ, 0); + tt_int_op(0L,OP_EQ, + tor_parse_long("-"TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + tt_int_op(i,OP_EQ, 0); + tt_int_op(0UL,OP_EQ, tor_parse_ulong(TOOBIG, 10, 0, ULONG_MAX, &i, NULL)); + tt_int_op(i,OP_EQ, 0); + tt_u64_op(U64_LITERAL(0), OP_EQ, tor_parse_uint64(TOOBIG, 10, + 0, UINT64_MAX, &i, NULL)); + tt_int_op(i,OP_EQ, 0); + } + done: + ; +} + +static void test_util_pow2(void *arg) { /* Test tor_log2(). */ @@ -5471,6 +5480,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(escape_string_socks), UTIL_LEGACY(string_is_key_value), UTIL_LEGACY(strmisc), + UTIL_TEST(parse_integer, 0), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip), UTIL_TEST(gzip_compression_bomb, TT_FORK),

1 0

[tor/master] Add facility to suppress/capture tor_bug_occurred_() messages in unit tests.
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit d09723ad19b1f292d31a3f52d8ef8052c8ece309 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 21:01:17 2016 -0400 Add facility to suppress/capture tor_bug_occurred_() messages in unit tests. --- src/common/util_bug.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/common/util_bug.h | 6 ++++++ 2 files changed, 52 insertions(+) diff --git a/src/common/util_bug.c b/src/common/util_bug.c index e3e1d6d..f1cd336 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -11,6 +11,44 @@ #include "util_bug.h" #include "torlog.h" #include "backtrace.h" +#include "container.h" + +#ifdef TOR_UNIT_TESTS +static int n_bugs_to_capture = 0; +static smartlist_t *bug_messages = NULL; +#define capturing_bugs() (bug_messages != NULL && n_bugs_to_capture) +void +tor_capture_bugs_(int n) +{ + tor_end_capture_bugs_(); + bug_messages = smartlist_new(); + n_bugs_to_capture = n; +} +void +tor_end_capture_bugs_(void) +{ + n_bugs_to_capture = 0; + if (!bug_messages) + return; + SMARTLIST_FOREACH(bug_messages, char *, cp, tor_free(cp)); + smartlist_free(bug_messages); + bug_messages = NULL; +} +const smartlist_t * +tor_get_captured_bug_log_(void) +{ + return bug_messages; +} +static void +add_captured_bug(const char *s) +{ + --n_bugs_to_capture; + smartlist_add(bug_messages, tor_strdup(s)); +} +#else +#define capturing_bugs() (0) +#define add_captured_bug(s) do { } while (0) +#endif /** Helper for tor_assert: report the assertion failure. */ void @@ -36,12 +74,20 @@ tor_bug_occurred_(const char *fname, unsigned int line, const char *once_str = once ? " (Future instances of this warning will be silenced.)": ""; if (! expr) { + if (capturing_bugs()) { + add_captured_bug("This line should not have been reached."); + return; + } log_warn(LD_BUG, "%s:%u: %s: This line should not have been reached.%s", fname, line, func, once_str); tor_snprintf(buf, sizeof(buf), "Line unexpectedly reached at %s at %s:%u", func, fname, line); } else { + if (capturing_bugs()) { + add_captured_bug(expr); + return; + } log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s", fname, line, func, expr, once_str); tor_snprintf(buf, sizeof(buf), diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 8b85d47..049ca1a 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -149,5 +149,11 @@ void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, int once); +#ifdef TOR_UNIT_TESTS +void tor_capture_bugs_(int n); +void tor_end_capture_bugs_(void); +const struct smartlist_t *tor_get_captured_bug_log_(void); +#endif + #endif

1 0

[tor/master] Capture and detect the BUG() warnings in test_util_parse_integer.
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 3823d0aa7d2a3ea4c21610c111aa199f75ace107 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 21:01:52 2016 -0400 Capture and detect the BUG() warnings in test_util_parse_integer. --- src/test/test_util.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 974caee..3fd2dc3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1974,10 +1974,20 @@ test_util_parse_integer(void *arg) tt_int_op(1,OP_EQ, i); tt_str_op(cp,OP_EQ, " plus garbage"); /* Illogical min max */ + tor_capture_bugs_(1); tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,4,&i,NULL)); tt_int_op(0,OP_EQ, i); + tt_int_op(1, OP_EQ, smartlist_len(tor_get_captured_bug_log_())); + tt_str_op("!(max < min)", OP_EQ, + smartlist_get(tor_get_captured_bug_log_(), 0)); + tor_end_capture_bugs_(); + tor_capture_bugs_(1); tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,100,-100,&i,NULL)); tt_int_op(0,OP_EQ, i); + tt_int_op(1, OP_EQ, smartlist_len(tor_get_captured_bug_log_())); + tt_str_op("!(max < min)", OP_EQ, + smartlist_get(tor_get_captured_bug_log_(), 0)); + tor_end_capture_bugs_(); /* Out of bounds */ tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,100,&i,NULL)); tt_int_op(0,OP_EQ, i); @@ -2061,7 +2071,7 @@ test_util_parse_integer(void *arg) tt_int_op(i,OP_EQ, 0); } done: - ; + tor_end_capture_bugs_(); } static void

1 0

[tor/master] Fix a unit test bug for passing arguments to tor_parse_ulong.
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 2a4a815f5801e79e67e9906eecdd544d25fcbfd6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:29:55 2016 -0400 Fix a unit test bug for passing arguments to tor_parse_ulong. We wanted to make sure -50 was a bad input, but instead we were passing a 'min' that was greater than 'max'. --- src/test/test_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6836c01..974caee 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2001,9 +2001,11 @@ test_util_parse_integer(void *arg) tt_int_op(10UL,OP_EQ, tor_parse_ulong("10",10,10,100,NULL,NULL)); tt_int_op(0UL,OP_EQ, tor_parse_ulong("8",8,0,100,NULL,NULL)); tt_int_op(50UL,OP_EQ, tor_parse_ulong("50",10,50,100,NULL,NULL)); - tt_int_op(0UL,OP_EQ, tor_parse_ulong("-50",10,-100,100,NULL,NULL)); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("-50",10,0,100,NULL,NULL)); tt_int_op(0UL,OP_EQ, tor_parse_ulong("50",-1,50,100,&i,NULL)); tt_int_op(0,OP_EQ, i); + tt_int_op(0UL,OP_EQ, tor_parse_ulong("-50",10,0,100,&i,NULL)); + tt_int_op(0,OP_EQ, i); /* Test parse_uint64 */ tt_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp));

1 0

[tor/master] Add !(...) to BUG() log messages
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 2b39c927c7f2c13f17d9883371a12131b6c6df40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:59:07 2016 -0400 Add !(...) to BUG() log messages They use the same code as reporting assertion failures, so we should invert the sense of what we're "asserting". Fixes bug 20093. --- changes/bug20093 | 4 ++++ src/common/util_bug.h | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug20093 b/changes/bug20093 new file mode 100644 index 0000000..ef32601 --- /dev/null +++ b/changes/bug20093 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - When logging a message from the BUG() macro, be explicit about what + we were asserting. Previously we were confusing what we were asserting + with what the bug was. Fixes bug 20093; bugfix on 0.2.9.1-alpha. diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 3f77e0a..8b85d47 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -65,7 +65,8 @@ #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ (PREDICT_UNLIKELY(cond) ? \ - (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,#cond), abort(), 1) \ + (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ + abort(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert_nonfatal_unreached() STMT_NIL @@ -98,18 +99,19 @@ STMT_END #define BUG(cond) \ (PREDICT_UNLIKELY(cond) ? \ - (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,#cond,0), 1) \ + (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \ : 0) #endif #ifdef __GNUC__ #define IF_BUG_ONCE__(cond,var) \ - if (( { \ + if (( { \ static int var = 0; \ int bool_result = (cond); \ if (PREDICT_UNLIKELY(bool_result) && !var) { \ var = 1; \ - tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ + "!("#cond")", 1); \ } \ PREDICT_UNLIKELY(bool_result); } )) #else @@ -118,7 +120,8 @@ if (PREDICT_UNLIKELY(cond)) ? \ (var ? 1 : \ (var=1, \ - tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1), \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ + "!("#cond")", 1), \ 1)) \ : 0) #endif

1 0

[torspec/master] prop224: Change format of enc-key cross certification
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit d0e79a351cfcadbd6ce654521d416ac04c6f9f7c Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 24 13:17:28 2016 -0400 prop224: Change format of enc-key cross certification Use a more standard format from Tor and proposal 220 instead of our own construction. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 9833b49..fd0f76c 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1036,17 +1036,16 @@ Table of contents: Cross-certification of the descriptor signing key by the enc-key. The format of this certificate depends on the type of enc-key. - For "ntor" keys, certificate is a proposal 220 certificate in - "-----BEGIN ED25519 CERT-----" armor, cross-certifying the + For "ntor" keys, certificate is a proposal 220 certificate wrapped + in "-----BEGIN ED25519 CERT-----" armor, cross-certifying the descriptor signing key with the ed25519 equivalent of the curve25519 public key from "enc-key" derived using the process in proposal 228 appendix A. The certificate type must be [10], and the signing-key extension is mandatory. - For "legacy" keys, certificate is an RSA signature wrapped in - "-----BEGIN SIGNATURE-----" of the digest: - H("legacy introduction point encryption key" | ED25519_KEY) - ED25519_KEY is the 32 byte descriptor signing public key. + For "legacy" keys, certificate is a proposal 220 certificate wrapped + in "-----BEGIN CROSSCERT-----" armor, cross-certifying the + descriptor signing key with the legacy RSA encryption key. To remain compatible with future revisions to the descriptor format, clients should ignore unrecognized lines in the descriptor.

1 0

[torspec/master] Merge remote-tracking branch 'asn/ticket19972_01'
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit fbc791d59c8da4ecdef4a3dee6286a16def1c572 Merge: 4aff960 92c372b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:12:08 2016 -0400 Merge remote-tracking branch 'asn/ticket19972_01' proposals/224-rend-spec-ng.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)

1 0

[torspec/master] Correct an error in proposal 224 citing 220
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 3cc0e9b3a82435404f00036bd11b33689cc98080 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 20:12:40 2016 -0400 Correct an error in proposal 224 citing 220 --- proposals/224-rend-spec-ng.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 6cbdc9b..bf2bfe6 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1044,9 +1044,10 @@ Table of contents: appendix A. The certificate type must be [10], and the signing-key extension is mandatory. - For "legacy" keys, certificate is a proposal 220 certificate wrapped - in "-----BEGIN CROSSCERT-----" armor, cross-certifying the - descriptor signing key with the legacy RSA encryption key. + For "legacy" keys, certificate is a proposal 220 RSA->Ed + cross-certificate wrapped in "-----BEGIN CROSSCERT-----" armor, + cross-certifying the descriptor signing key with the legacy RSA + encryption key. To remain compatible with future revisions to the descriptor format, clients should ignore unrecognized lines in the descriptor.

1 0

[torspec/master] prop224: Add string prefix to HS descriptor signature.
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit 92c372b0710ea4652015807f71b51adab6272737 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 25 12:37:58 2016 +0300 prop224: Add string prefix to HS descriptor signature. --- proposals/224-rend-spec-ng.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index fd0f76c..6cbdc9b 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -941,9 +941,10 @@ Table of contents: [exactly once, at end.] A signature of all previous fields, using the signing key in the - descriptor-signing-key-cert line. We use a separate key for signing, so that - the hidden service host does not need to have its private blinded - key online. + descriptor-signing-key-cert line, prefixed by the string "Tor onion + service descriptor sig v3". We use a separate key for signing, so that + the hidden service host does not need to have its private blinded key + online. 2.5. Hidden service descriptors: encryption format [ENCRYPTED-DATA]

1 0