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

[tor/master] Refactor tests for tor_htonll and tor_ntohll
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit c613446ca2fa0d81fcf1f3169a2a6caa8e7a8ba3 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Thu Nov 3 20:52:11 2016 +0000 Refactor tests for tor_htonll and tor_ntohll Following kind feedback from dgoulet: add tests for min (0) and max (UINT64_MAX) values. Rename expected results to something more sensible than 'n'. --- src/test/test_util.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ea6e946..b74f658 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5616,14 +5616,23 @@ static void test_util_htonll(void *arg) { (void)arg; - const uint64_t n = 0x1122334455667788; +#ifdef WORDS_BIGENDIAN + const uint64_t res_be = 0x8877665544332211; +#else + const uint64_t res_le = 0x1122334455667788; +#endif + + tt_u64_op(0, OP_EQ, tor_htonll(0)); + tt_u64_op(0, OP_EQ, tor_ntohll(0)); + tt_u64_op(UINT64_MAX, OP_EQ, tor_htonll(UINT64_MAX)); + tt_u64_op(UINT64_MAX, OP_EQ, tor_ntohll(UINT64_MAX)); #ifdef WORDS_BIGENDIAN - tt_u64_op(tor_htonll(n), OP_EQ, n); - tt_u64_op(tor_ntohll(0x8877665544332211), OP_EQ, 0x8877665544332211); + tt_u64_op(res_be, OP_EQ, tor_htonll(0x8877665544332211)); + tt_u64_op(res_be, OP_EQ, tor_ntohll(0x8877665544332211)); #else - tt_u64_op(tor_htonll(n), OP_EQ, 0x8877665544332211); - tt_u64_op(tor_ntohll(0x8877665544332211), OP_EQ, n); + tt_u64_op(res_le, OP_EQ, tor_htonll(0x8877665544332211)); + tt_u64_op(res_le, OP_EQ, tor_ntohll(0x8877665544332211)); #endif done:

1 0

[tor/master] Use tor_htonll in test_util_format_unaligned_accessors
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit dce4603d9b55a51d8894972e443b4244fd5ae962 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Thu Nov 3 21:18:02 2016 +0000 Use tor_htonll in test_util_format_unaligned_accessors Remove the inline htonll, switch to tor_htonll for test_util_format_unaligned_accessors. --- src/test/test_util_format.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index 63a6682..1d58ba2 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -11,25 +11,14 @@ #define NS_MODULE util_format -#if !defined(HAVE_HTONLL) && !defined(htonll) -#ifdef WORDS_BIGENDIAN -#define htonll(x) (x) -#else -static uint64_t -htonll(uint64_t a) -{ - return htonl((uint32_t)(a>>32)) | (((uint64_t)htonl((uint32_t)a))<<32); -} -#endif -#endif - static void test_util_format_unaligned_accessors(void *ignored) { (void)ignored; char buf[9] = "onionsoup"; // 6f6e696f6e736f7570 - tt_u64_op(get_uint64(buf+1), OP_EQ, htonll(U64_LITERAL(0x6e696f6e736f7570))); + tt_u64_op(get_uint64(buf+1), OP_EQ, + tor_htonll(U64_LITERAL(0x6e696f6e736f7570))); tt_uint_op(get_uint32(buf+1), OP_EQ, htonl(0x6e696f6e)); tt_uint_op(get_uint16(buf+1), OP_EQ, htons(0x6e69)); tt_uint_op(get_uint8(buf+1), OP_EQ, 0x6e); @@ -43,7 +32,7 @@ test_util_format_unaligned_accessors(void *ignored) set_uint32(buf+1, htonl(0x78696465)); tt_mem_op(buf, OP_EQ, "oxidestop", 9); - set_uint64(buf+1, htonll(U64_LITERAL(0x6266757363617465))); + set_uint64(buf+1, tor_htonll(U64_LITERAL(0x6266757363617465))); tt_mem_op(buf, OP_EQ, "obfuscate", 9); done: ;

1 0

[tor/master] Add unit test for tor_htonll and tor_ntohll
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit c4603233db965262721a1481bb55f1cc508b48d5 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Thu Nov 3 19:37:59 2016 +0000 Add unit test for tor_htonll and tor_ntohll Add tests for tor_htonll and tor_ntohll - fixes bug 19563. --- src/test/test_util.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7276c0c..ea6e946 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5612,6 +5612,24 @@ test_util_monotonic_time_ratchet(void *arg) ; } +static void +test_util_htonll(void *arg) +{ + (void)arg; + const uint64_t n = 0x1122334455667788; + +#ifdef WORDS_BIGENDIAN + tt_u64_op(tor_htonll(n), OP_EQ, n); + tt_u64_op(tor_ntohll(0x8877665544332211), OP_EQ, 0x8877665544332211); +#else + tt_u64_op(tor_htonll(n), OP_EQ, 0x8877665544332211); + tt_u64_op(tor_ntohll(0x8877665544332211), OP_EQ, n); +#endif + + done: + ; +} + #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -5705,6 +5723,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(calloc_check, 0), UTIL_TEST(monotonic_time, 0), UTIL_TEST(monotonic_time_ratchet, TT_FORK), + UTIL_TEST(htonll, 0), END_OF_TESTCASES };

1 0

[tor/master] changes file for 19563
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit b96bb82a2a66cf1d593c7ceabc193e36cbf60774 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:41:40 2016 -0400 changes file for 19563 --- changes/bug19563 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug19563 b/changes/bug19563 new file mode 100644 index 0000000..dbf3859 --- /dev/null +++ b/changes/bug19563 @@ -0,0 +1,3 @@ + o Testing: + - New unit tests for tor_htonll(). Closes ticket 19563. Patch from + "overcaffeinated".

1 0

[tor/master] Merge remote-tracking branch 'mintytoast/bug_19563'
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 80a5091e4f823a5e5d641cffd4ae460380e2ce12 Merge: f9b650f dce4603 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:40:41 2016 -0400 Merge remote-tracking branch 'mintytoast/bug_19563' src/test/test_util.c | 28 ++++++++++++++++++++++++++++ src/test/test_util_format.c | 17 +++-------------- 2 files changed, 31 insertions(+), 14 deletions(-)

1 0

[tor/maint-0.2.8] Use explicit casts to avoid warnings when building with openssl 1.1
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 464783a8dcc337c103801b8c551d1331baec1e9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 09:35:41 2016 -0400 Use explicit casts to avoid warnings when building with openssl 1.1 fixes bug 20551; bugfix on 0.2.1.1-alpha --- changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug20551 b/changes/bug20551 new file mode 100644 index 0000000..1e0746b --- /dev/null +++ b/changes/bug20551 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation); + - Fix implicit conversion warnings under OpenSSL 1.1. + Fixes bug 20551; bugfix on 0.2.1.1-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index 9507bb7..89ad6af 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1656,8 +1656,8 @@ tor_tls_new(int sock, int isServer) result->state = TOR_TLS_ST_HANDSHAKE; result->isServer = isServer; result->wantwrite_n = 0; - result->last_write_count = BIO_number_written(bio); - result->last_read_count = BIO_number_read(bio); + result->last_write_count = (unsigned long) BIO_number_written(bio); + result->last_read_count = (unsigned long) BIO_number_read(bio); if (result->last_write_count || result->last_read_count) { log_warn(LD_NET, "Newly created BIO has read count %lu, write count %lu", result->last_read_count, result->last_write_count); @@ -2271,7 +2271,7 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written) { BIO *wbio, *tmpbio; unsigned long r, w; - r = BIO_number_read(SSL_get_rbio(tls->ssl)); + r = (unsigned long) BIO_number_read(SSL_get_rbio(tls->ssl)); /* We want the number of bytes actually for real written. Unfortunately, * sometimes OpenSSL replaces the wbio on tls->ssl with a buffering bio, * which makes the answer turn out wrong. Let's cope with that. Note @@ -2292,7 +2292,7 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written) if (wbio->method == BIO_f_buffer() && (tmpbio = BIO_next(wbio)) != NULL) wbio = tmpbio; #endif - w = BIO_number_written(wbio); + w = (unsigned long) BIO_number_written(wbio); /* We are ok with letting these unsigned ints go "negative" here: * If we wrapped around, this should still give us the right answer, unless

1 0

[tor/maint-0.2.8] Merge branch 'bug20551_028' into maint-0.2.8
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 61bdc452b098acf681466204e51d49199067ff33 Merge: 7a45ef5 464783a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:36:25 2016 -0400 Merge branch 'bug20551_028' into maint-0.2.8 changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.9] Merge branch 'bug20551_028' into maint-0.2.8
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 61bdc452b098acf681466204e51d49199067ff33 Merge: 7a45ef5 464783a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:36:25 2016 -0400 Merge branch 'bug20551_028' into maint-0.2.8 changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 59f4cae68c00e6b894e68d8cfefae295a8b9eb89 Merge: 3cd520a 61bdc45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:36:43 2016 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.9] Use explicit casts to avoid warnings when building with openssl 1.1
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 464783a8dcc337c103801b8c551d1331baec1e9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 09:35:41 2016 -0400 Use explicit casts to avoid warnings when building with openssl 1.1 fixes bug 20551; bugfix on 0.2.1.1-alpha --- changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug20551 b/changes/bug20551 new file mode 100644 index 0000000..1e0746b --- /dev/null +++ b/changes/bug20551 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation); + - Fix implicit conversion warnings under OpenSSL 1.1. + Fixes bug 20551; bugfix on 0.2.1.1-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index 9507bb7..89ad6af 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1656,8 +1656,8 @@ tor_tls_new(int sock, int isServer) result->state = TOR_TLS_ST_HANDSHAKE; result->isServer = isServer; result->wantwrite_n = 0; - result->last_write_count = BIO_number_written(bio); - result->last_read_count = BIO_number_read(bio); + result->last_write_count = (unsigned long) BIO_number_written(bio); + result->last_read_count = (unsigned long) BIO_number_read(bio); if (result->last_write_count || result->last_read_count) { log_warn(LD_NET, "Newly created BIO has read count %lu, write count %lu", result->last_read_count, result->last_write_count); @@ -2271,7 +2271,7 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written) { BIO *wbio, *tmpbio; unsigned long r, w; - r = BIO_number_read(SSL_get_rbio(tls->ssl)); + r = (unsigned long) BIO_number_read(SSL_get_rbio(tls->ssl)); /* We want the number of bytes actually for real written. Unfortunately, * sometimes OpenSSL replaces the wbio on tls->ssl with a buffering bio, * which makes the answer turn out wrong. Let's cope with that. Note @@ -2292,7 +2292,7 @@ tor_tls_get_n_raw_bytes(tor_tls_t *tls, size_t *n_read, size_t *n_written) if (wbio->method == BIO_f_buffer() && (tmpbio = BIO_next(wbio)) != NULL) wbio = tmpbio; #endif - w = BIO_number_written(wbio); + w = (unsigned long) BIO_number_written(wbio); /* We are ok with letting these unsigned ints go "negative" here: * If we wrapped around, this should still give us the right answer, unless

1 0