nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug20551_028' into maint-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson 2016-11-03 18:36:25 -04:00
commit 61bdc452b0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug20551 Normal file
View File

@ -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.

8
src/common/tortls.c
View File

@ -1656,8 +1656,8 @@ tor_tls_new(int sock, int isServer)
result->state = TOR_TLS_ST_HANDSHAKE; result->state = TOR_TLS_ST_HANDSHAKE;
result->isServer = isServer; result->isServer = isServer;
result->wantwrite_n = 0; result->wantwrite_n = 0;
result->last_write_count = BIO_number_written(bio); result->last_write_count = (unsigned long) BIO_number_written(bio);
result->last_read_count = BIO_number_read(bio); result->last_read_count = (unsigned long) BIO_number_read(bio);
if (result->last_write_count || result->last_read_count) { if (result->last_write_count || result->last_read_count) {
log_warn(LD_NET, "Newly created BIO has read count %lu, write count %lu", log_warn(LD_NET, "Newly created BIO has read count %lu, write count %lu",
result->last_read_count, result->last_write_count); 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; BIO *wbio, *tmpbio;
unsigned long r, w; 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, /* We want the number of bytes actually for real written. Unfortunately,
* sometimes OpenSSL replaces the wbio on tls->ssl with a buffering bio, * 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 * 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) if (wbio->method == BIO_f_buffer() && (tmpbio = BIO_next(wbio)) != NULL)
wbio = tmpbio; wbio = tmpbio;
#endif #endif
w = BIO_number_written(wbio); w = (unsigned long) BIO_number_written(wbio);
/* We are ok with letting these unsigned ints go "negative" here: /* We are ok with letting these unsigned ints go "negative" here:
* If we wrapped around, this should still give us the right answer, unless * If we wrapped around, this should still give us the right answer, unless