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

[torbirdy/master] Added support for automatic configuration of systemli.org email accounts
by sukhbir＠torproject.org 29 Jun '16

29 Jun '16

commit 9204ddc23dbb6bf755af91a933f2a3fb210ba0d2 Author: shadow <shadow(a)systemli.org> Date: Wed Jun 29 15:33:37 2016 +0200 Added support for automatic configuration of systemli.org email accounts --- chrome/content/emailwizard.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2da6ad7..d09ea5b 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -106,6 +106,10 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.incoming.hostname = "mail.%EMAILDOMAIN%"; config.outgoing.hostname = "mail.%EMAILDOMAIN%"; break; + case "systemli.org": + config.incoming.hostname = "mail.%EMAILDOMAIN%"; + config.outgoing.hostname = "mail.%EMAILDOMAIN%"; + break; } replaceVariables(config, realname, email, password);

1 0

[tor/master] Fix an integer overflow bug in the tv_mdiff range check
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 2e51608a8b7d883f5e187ccc83ed871e248442c2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 29 12:53:50 2016 +1000 Fix an integer overflow bug in the tv_mdiff range check The temporary second used for rounding can cause overflow, depending on the order the compiler performs the operations. --- src/common/util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index 4b6df81..44994fb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1394,6 +1394,7 @@ tv_udiff(const struct timeval *start, const struct timeval *end) long udiff; long secdiff = end->tv_sec - start->tv_sec; + /* end->tv_usec - start->tv_usec can be up to 1 second */ if (labs(secdiff)+1 > LONG_MAX/1000000) { log_warn(LD_GENERAL, "comparing times on microsecond detail too far " "apart: %ld seconds", secdiff); @@ -1412,7 +1413,9 @@ tv_mdiff(const struct timeval *start, const struct timeval *end) long mdiff; long secdiff = end->tv_sec - start->tv_sec; - if (labs(secdiff)+1 > LONG_MAX/1000) { + /* end->tv_usec - start->tv_usec can be up to 1 second, + * but the mdiff calculation adds another temporary second */ + if (labs(secdiff)+2 > LONG_MAX/1000) { log_warn(LD_GENERAL, "comparing times on millisecond detail too far " "apart: %ld seconds", secdiff); return LONG_MAX;

1 0

[tor/master] Improve overflow checks in tv_udiff and tv_mdiff
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 4234ca3bf2c87d01026b3d003f6e5b4d1ec5b7df Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 29 13:30:28 2016 +1000 Improve overflow checks in tv_udiff and tv_mdiff Validate that tv_usec inputs to tv_udiff and tv_mdiff are in range. Do internal calculations in tv_udiff and tv_mdiff in 64-bit, which makes the function less prone to integer overflow, particularly on platforms where long and time_t are 32-bit, but tv_sec is 64-bit, like some BSD configurations. Check every addition and subtraction that could overflow. --- src/common/util.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 17 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 44994fb..613e000 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1386,51 +1386,132 @@ tor_escape_str_for_pt_args(const char *string, const char *chars_to_escape) * Time * ===== */ +#define TOR_USEC_PER_SEC 1000000 + +/** Return the difference between start->tv_sec and end->tv_sec. + * Returns INT64_MAX on overflow and underflow. + */ +static int64_t +tv_secdiff_impl(const struct timeval *start, const struct timeval *end) +{ + const int64_t s = (int64_t)start->tv_sec; + const int64_t e = (int64_t)end->tv_sec; + + /* This may not be the most efficient way of implemeting this check, + * but it's easy to see that it's correct and doesn't overflow */ + + if (s > 0 && e < INT64_MIN + s) { + /* s is positive: equivalent to e - s < INT64_MIN, but without any + * overflow */ + return INT64_MAX; + } else if (s < 0 && e > INT64_MAX + s) { + /* s is negative: equivalent to e - s > INT64_MAX, but without any + * overflow */ + return INT64_MAX; + } + + return e - s; +} + /** Return the number of microseconds elapsed between *start and *end. + * Returns LONG_MAX on overflow and underflow. */ long tv_udiff(const struct timeval *start, const struct timeval *end) { - long udiff; - long secdiff = end->tv_sec - start->tv_sec; + /* Sanity check tv_usec */ + if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " + "start tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(start->tv_usec)); + return LONG_MAX; + } - /* end->tv_usec - start->tv_usec can be up to 1 second */ - if (labs(secdiff)+1 > LONG_MAX/1000000) { + if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on microsecond detail with bad " + "end tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(end->tv_usec)); + return LONG_MAX; + } + + /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit + */ + int64_t udiff; + const int64_t secdiff = tv_secdiff_impl(start, end); + + /* end->tv_usec - start->tv_usec can be up to 1 second either way */ + if (secdiff > (int64_t)(LONG_MAX/1000000 - 1) || + secdiff < (int64_t)(LONG_MIN/1000000 + 1)) { log_warn(LD_GENERAL, "comparing times on microsecond detail too far " - "apart: %ld seconds", secdiff); + "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); return LONG_MAX; } - udiff = secdiff*1000000L + (end->tv_usec - start->tv_usec); - return udiff; + /* we'll never get an overflow here, because we check that both usecs are + * between 0 and TV_USEC_PER_SEC. */ + udiff = secdiff*1000000 + ((int64_t)end->tv_usec - (int64_t)start->tv_usec); + + if (udiff > (int64_t)LONG_MAX || udiff < (int64_t)LONG_MIN) { + return LONG_MAX; + } else { + return (long)udiff; + } } /** Return the number of milliseconds elapsed between *start and *end. + * If the tv_usec difference is 500, rounds away from zero. + * Returns LONG_MAX on overflow and underflow. */ long tv_mdiff(const struct timeval *start, const struct timeval *end) { - long mdiff; - long secdiff = end->tv_sec - start->tv_sec; + /* Sanity check tv_usec */ + if (start->tv_usec > TOR_USEC_PER_SEC || start->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " + "start tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(start->tv_usec)); + return LONG_MAX; + } + + if (end->tv_usec > TOR_USEC_PER_SEC || end->tv_usec < 0) { + log_warn(LD_GENERAL, "comparing times on millisecond detail with bad " + "end tv_usec: " I64_FORMAT " microseconds", + I64_PRINTF_ARG(end->tv_usec)); + return LONG_MAX; + } - /* end->tv_usec - start->tv_usec can be up to 1 second, - * but the mdiff calculation adds another temporary second */ - if (labs(secdiff)+2 > LONG_MAX/1000) { + /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit + */ + int64_t mdiff; + const int64_t secdiff = tv_secdiff_impl(start, end); + + /* end->tv_usec - start->tv_usec can be up to 1 second either way, but the + * mdiff calculation may add another temporary second for rounding. + * Whether this actually causes overflow depends on the compiler's constant + * folding and order of operations. */ + if (secdiff > (int64_t)(LONG_MAX/1000 - 2) || + secdiff < (int64_t)(LONG_MIN/1000 + 1)) { log_warn(LD_GENERAL, "comparing times on millisecond detail too far " - "apart: %ld seconds", secdiff); + "apart: " I64_FORMAT " seconds", I64_PRINTF_ARG(secdiff)); return LONG_MAX; } /* Subtract and round */ - mdiff = secdiff*1000L + + mdiff = secdiff*1000 + /* We add a million usec here to ensure that the result is positive, * so that the round-towards-zero behavior of the division will give * the right result for rounding to the nearest msec. Later we subtract * 1000 in order to get the correct result. - */ - ((long)end->tv_usec - (long)start->tv_usec + 500L + 1000000L) / 1000L + * We'll never get an overflow here, because we check that both usecs are + * between 0 and TV_USEC_PER_SEC. */ + ((int64_t)end->tv_usec - (int64_t)start->tv_usec + 500 + 1000000) / 1000 - 1000; - return mdiff; + + if (mdiff > (int64_t)LONG_MAX || mdiff < (int64_t)LONG_MIN) { + return LONG_MAX; + } else { + return (long)mdiff; + } } /**

1 0

[tor/master] Add more unit tests for tv_udiff and tv_mdiff
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit d36a0c4d22d8c018378790634315e044aea6a8a0 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 29 17:02:39 2016 +1000 Add more unit tests for tv_udiff and tv_mdiff --- src/test/test_util.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 261 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 56c71e8..8951292 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -272,35 +272,294 @@ test_util_time(void *arg) tt_int_op(0L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(0L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(0L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(0L,OP_EQ, tv_mdiff(&end, &start)); end.tv_usec = 7000; tt_int_op(2000L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(2L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-2000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-2L,OP_EQ, tv_mdiff(&end, &start)); end.tv_sec = 6; tt_int_op(1002000L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(1002L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-1002000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-1002L,OP_EQ, tv_mdiff(&end, &start)); end.tv_usec = 0; tt_int_op(995000L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(995L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-995000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-995L,OP_EQ, tv_mdiff(&end, &start)); end.tv_sec = 4; tt_int_op(-1005000L,OP_EQ, tv_udiff(&start, &end)); tt_int_op(-1005L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(1005000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(1005L,OP_EQ, tv_mdiff(&end, &start)); + + /* Test that tv_usec values round away from zero when converted to msec */ + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = 10; + end.tv_usec = 499; + + tt_int_op(10000499L, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(10000L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-10000499L, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-10000L, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = 10; + end.tv_usec = 500; + + tt_int_op(10000500L, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(10001L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-10000500L, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-10000L, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = 10; + end.tv_usec = 501; + + tt_int_op(10000501L, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(10001L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-10000501L, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-10001L, OP_EQ, tv_mdiff(&end, &start)); + + /* Overflow conditions */ #ifdef _WIN32 /* Would you believe that tv_sec is a long on windows? Of course you would.*/ - end.tv_sec = LONG_MAX; +#define TV_SEC_MAX LONG_MAX +#define TV_SEC_MIN LONG_MIN #else - end.tv_sec = TIME_MAX; + /* Some BSDs have struct timeval.tv_sec 64-bit, but time_t (and long) 32-bit + * Which means TIME_MAX is not actually the maximum value of tv_sec. + * But that's ok for the moment, because the code correctly performs 64-bit + * calculations internally, then catches the overflow. */ +#define TV_SEC_MAX TIME_MAX +#define TV_SEC_MIN TIME_MIN #endif + +/* Assume tv_usec is an unsigned integer until proven otherwise */ +#define TV_USEC_MAX UINT_MAX +#define TOR_USEC_PER_SEC 1000000 + + /* Overflows in the result type */ + + /* All comparisons work */ + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000 - 2; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(end.tv_sec*1000L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-end.tv_sec*1000L, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000000 - 1; + end.tv_usec = 0; + + tt_int_op(end.tv_sec*1000000L, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(end.tv_sec*1000L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-end.tv_sec*1000000L, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-end.tv_sec*1000L, OP_EQ, tv_mdiff(&end, &start)); + + /* No comparisons work */ + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000 + 1; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000000 + 1; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(end.tv_sec*1000L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-end.tv_sec*1000L, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000; + end.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = 0; + start.tv_usec = 0; + end.tv_sec = LONG_MAX/1000000; + end.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op((end.tv_sec + 1)*1000L, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-(end.tv_sec + 1)*1000L, OP_EQ, tv_mdiff(&end, &start)); + + /* Overflows on comparison to zero */ + + start.tv_sec = 0; + start.tv_usec = 0; + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = 0; + end.tv_usec = TV_USEC_MAX; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = TV_USEC_MAX; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = 0; + end.tv_usec = 0; + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = TV_USEC_MAX; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + /* overflows on comparison to maxima / minima */ + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = 0; + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = 0; + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + /* overflows on comparison to maxima / minima with extra usec */ + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = TOR_USEC_PER_SEC; + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = TOR_USEC_PER_SEC; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + end.tv_sec = TV_SEC_MAX; + end.tv_usec = TOR_USEC_PER_SEC; + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = 0; + + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = TV_SEC_MIN; + start.tv_usec = TOR_USEC_PER_SEC; + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&start, &end)); tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(LONG_MAX, OP_EQ, tv_udiff(&end, &start)); + tt_int_op(LONG_MAX, OP_EQ, tv_mdiff(&end, &start)); /* Test tor_timegm & tor_gmtime_r */

1 0

[tor/master] Add changes file for bug19483
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 8938250c1003c042b66cd0ff554e8ec49c250d43 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jun 29 17:19:27 2016 +1000 Add changes file for bug19483 --- changes/bug19483 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug19483 b/changes/bug19483 new file mode 100644 index 0000000..034ff30 --- /dev/null +++ b/changes/bug19483 @@ -0,0 +1,3 @@ + o Minor fixes (time): + - Improve overflow checks in tv_udiff and tv_mdiff. + Fixes bug 19483, present in all tor versions.

1 0

[tor-browser-spec/master] Updated FF45 network audit for Android
by gk＠torproject.org 29 Jun '16

29 Jun '16

commit 208cad5532fc28e797860e8b82446066f5136e8a Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Mon Jun 27 16:06:37 2016 +0200 Updated FF45 network audit for Android --- audits/FF45_NETWORK_AUDIT | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/audits/FF45_NETWORK_AUDIT b/audits/FF45_NETWORK_AUDIT index 7f3169a..9b67e56 100644 --- a/audits/FF45_NETWORK_AUDIT +++ b/audits/FF45_NETWORK_AUDIT @@ -408,15 +408,42 @@ Misc XPCOM: Android Java calls: + Uses HttpURLConnection: - + mobile/android/base/CrashReporter.java - + mobile/android/base/SuggestClient.java - + mobile/android/base/distribution/Distribution.java - + Uses org.apache.http.client.* - + mobile/android/base/favicons/LoadFaviconTask.java - + Uses ch.boye.httpclientandroidlib.impl.client.*: - + mobile/android/base/sync/net/BaseResource.java - + mobile/android/base/CrashReporter.java - + mobile/android/base/SuggestClient.java - + mobile/android/base/distribution/Distribution.java + + mobile/android/base/java/org/mozilla/gecko/CrashReporter.java + + mobile/android/base/java/org/mozilla/gecko/SuggestClient.java + + mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java + mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java + mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java + + mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseRobocopTest.java + + mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testDistribution.java + + mobile/android/thirdparty/com/keepsafe/switchboard/SwitchBoard.java + + mobile/android/thirdparty/com/squareup/picasso/UrlConnectionDownloader.java + + Uses ch.boye.httpclientandroidlib.impl.client.*: + + mobile/android/base/java/org/mozilla/gecko/dlc/DownloadContentHelper.java + + mobile/android/base/java/org/mozilla/gecko/favicons/LoadFaviconTask.java + + mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountClient10.java + + mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/oauth/FxAccountAbstractClient.java + + mobile/android/services/src/main/java/org/mozilla/gecko/reading/ReadingListClient.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/jpake/stage/DeleteChannel.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/jpake/stage/GetChannelStage.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/jpake/stage/GetRequestStage.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/jpake/stage/PutRequestStage.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/AbstractBearerTokenAuthHeaderProvider.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/AuthHeaderProvider.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResourceDelegate.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BasicAuthHeaderProvider.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HMACAuthHeaderProvider.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HawkAuthHeaderProvider.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/ResourceDelegate.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageCollectionRequest.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRequest.java + + mobile/android/services/src/main/java/org/mozilla/gecko/sync/setup/auth/AuthenticateAccountStage.java + + mobile/android/services/src/main/java/org/mozilla/gecko/tokenserver/TokenServerClient.java + + mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockResourceDelegate.java + + mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestHawkAuthHeaderProvider.java + + mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestLiveHawkAuth.java + + mobile/android/thirdparty/ch/boye/httpclientandroidlib/client/protocol/ResponseAuthCache.java + + mobile/android/thirdparty/ch/boye/httpclientandroidlib/impl/client/cache/CachingHttpClientBuilder.java + + mobile/android/thirdparty/ch/boye/httpclientandroidlib/impl/client/cache/CachingHttpClients.java + + mobile/android/thirdparty/ch/boye/httpclientandroidlib/impl/execchain/ProtocolExec.java + + mobile/android/thirdparty/com/adjust/sdk/AdjustFactory.java

1 0

[tor/maint-0.2.8] Remove a fallback that changed DirPort
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 828e2e1a2e1d438d2629000a85e535dc23891529 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jun 23 10:38:03 2016 +1000 Remove a fallback that changed DirPort The operator has confirmed that the DirPort change is perament. The relay will be reconsidered as a fallback in 0.2.9. --- scripts/maint/fallback.whitelist | 2 +- src/or/fallback_dirs.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 30db949..574caed 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -638,7 +638,7 @@ 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC # Email sent directly to teor, verified using relay contact info -178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D +178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D # Email sent directly to teor, verified using relay contact info 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 ipv6=[2a01:4f8:a0:43eb::beef]:9001 diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 58c67c0..e422940 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -136,8 +136,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay */ "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but DirPort changed before 0.2.8.5 "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D" " weight=10", +*/ "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605" " ipv6=[2001:41d0:e:f67::114]:9001" " weight=10",

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b Merge: d793a98 2c9354f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 19:15:43 2016 -0400 Merge branch 'maint-0.2.8' changes/ticket19071-19480 | 3 ++ scripts/maint/fallback.whitelist | 4 +-- scripts/maint/updateFallbackDirs.py | 9 +++-- src/or/fallback_dirs.inc | 67 +++++++++++++++++++------------------ 4 files changed, 47 insertions(+), 36 deletions(-)

1 0

[tor/master] Remove a fallback that changed DirPort
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 828e2e1a2e1d438d2629000a85e535dc23891529 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jun 23 10:38:03 2016 +1000 Remove a fallback that changed DirPort The operator has confirmed that the DirPort change is perament. The relay will be reconsidered as a fallback in 0.2.9. --- scripts/maint/fallback.whitelist | 2 +- src/or/fallback_dirs.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 30db949..574caed 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -638,7 +638,7 @@ 91.121.54.8:9030 orport=9001 id=CBEE0F3303C8C50462A12107CA2AE061831931BC # Email sent directly to teor, verified using relay contact info -178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D +178.217.184.32:8080 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D # Email sent directly to teor, verified using relay contact info 85.10.201.47:9030 orport=9001 id=D8B7A3A6542AA54D0946B9DC0257C53B6C376679 ipv6=[2a01:4f8:a0:43eb::beef]:9001 diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 58c67c0..e422940 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -136,8 +136,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay */ "93.180.156.84:9030 orport=9001 id=8844D87E9B038BE3270938F05AF797E1D3C74C0F" " weight=10", +/* Fallback was on 0.2.8.2-alpha list, but DirPort changed before 0.2.8.5 "178.217.184.32:9030 orport=443 id=8B7F47AE1A5D954A3E58ACDE0865D09DBA5B738D" " weight=10", +*/ "151.80.42.103:9030 orport=9001 id=9007C1D8E4F03D506A4A011B907A9E8D04E3C605" " ipv6=[2001:41d0:e:f67::114]:9001" " weight=10",

1 0

[tor/master] Whitelist a fallback's new IPv6 address
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit dae442a38272f26a2c0580a6ec03fec392c4ac9d Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jun 23 10:38:52 2016 +1000 Whitelist a fallback's new IPv6 address The IPv4-only entry will be used for 0.2.8. The IPv4 and IPv6 entry will be considered in 0.2.9. --- scripts/maint/fallback.whitelist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 574caed..fb432ca 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -658,7 +658,7 @@ # Email sent directly to teor, verified using relay contact info 96.47.231.214:9030 orport=8080 id=F843CB5729575D76FF1FFBB2179BDCF52C0C6387 192.99.246.48:9030 orport=9001 id=CD6B149BED1BB254EF6DFF9D75DDB11E7F8A38A4 ipv6=[2607:5300:100:200::de3]:9002 -192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F +192.160.102.164:80 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F ipv6=[2605:e200:d00c:c01d::1111]:9002 # Email sent directly to teor, verified using relay contact info 136.243.214.137:80 orport=443 id=B291D30517D23299AD7CEE3E60DFE60D0E3A4664

1 0