diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-03 18:36:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 18:36:43 -0400 |
| commit | 59f4cae68c00e6b894e68d8cfefae295a8b9eb89 (patch) | |
| tree | c96ccd28c0a74fa583ab60e91ea6511c7a6b2f7c | |
| parent | 3cd520a52d50b9e901d33d0164d847d12a278f1b (diff) | |
| parent | 61bdc452b098acf681466204e51d49199067ff33 (diff) | |
| download | tor-59f4cae68c00e6b894e68d8cfefae295a8b9eb89.tar.gz tor-59f4cae68c00e6b894e68d8cfefae295a8b9eb89.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
| -rw-r--r-- | changes/bug20551 | 3 | ||||
| -rw-r--r-- | 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 0000000000..1e0746b666 --- /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 cf3c8ab548..62ed5be344 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1635,8 +1635,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); @@ -2250,7 +2250,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 @@ -2271,7 +2271,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 |