tor-commits November 2016

tor-commits@lists.torproject.org

16 participants
1665 discussions

[tor/master] 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/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 03 Nov '16

03 Nov '16

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

1 0

[tor/release-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

[tor/release-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/release-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

1 0

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

03 Nov '16

1 0

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

03 Nov '16

1 0

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

03 Nov '16

commit f9b650fca6babce75db081ebf6a21bb79aea15cb Merge: 63c9495 59f4cae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:36:55 2016 -0400 Merge branch 'maint-0.2.9'

1 0

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

03 Nov '16

1 0

[tor/master] Fix BUG message in channel/queue_impossible
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 63c94954b15aa24294b713f6ab8b442bcfd4c444 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 18:34:44 2016 -0400 Fix BUG message in channel/queue_impossible --- src/test/test_channel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index a9e0634..e87f99e 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1405,10 +1405,14 @@ test_channel_queue_impossible(void *arg) /* Let it drain and check that the bad entry is discarded */ test_chan_accept_cells = 1; + tor_capture_bugs_(1); channel_change_state(ch, CHANNEL_STATE_OPEN); tt_assert(test_cells_written == old_count); tt_int_op(chan_cell_queue_len(&(ch->outgoing_queue)), ==, 0); + tt_int_op(smartlist_len(tor_get_captured_bug_log_()), ==, 1); + tor_end_capture_bugs_(); + done: free_fake_channel(ch);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2016