April 2020 - tor-commits - lists.torproject.org

[tor/master] buf: add BUF_MAX_LEN
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit f46b9320ae32f00aa97a397b33eaa7abdcb47fe3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 16:02:00 2020 +0000 buf: add BUF_MAX_LEN --- src/core/mainloop/connection.c | 4 ++-- src/lib/buf/buffers.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 708fb13cd..f692da650 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -3804,8 +3804,8 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, at_most = connection_bucket_read_limit(conn, approx_time()); } - /* Do not allow inbuf to grow past INT_MAX - 1. */ - const ssize_t maximum = INT_MAX - 1 - buf_datalen(conn->inbuf); + /* Do not allow inbuf to grow past BUF_MAX_LEN. */ + const ssize_t maximum = BUF_MAX_LEN - buf_datalen(conn->inbuf); if (at_most > maximum) { at_most = maximum; } diff --git a/src/lib/buf/buffers.h b/src/lib/buf/buffers.h index fadd4174c..d8a77feb7 100644 --- a/src/lib/buf/buffers.h +++ b/src/lib/buf/buffers.h @@ -29,6 +29,9 @@ void buf_free_(buf_t *buf); void buf_clear(buf_t *buf); buf_t *buf_copy(const buf_t *buf); +/** Maximum bytes in a buffer, inclusive. */ +#define BUF_MAX_LEN (INT_MAX - 1) + MOCK_DECL(size_t, buf_datalen, (const buf_t *buf)); size_t buf_allocation(const buf_t *buf); size_t buf_slack(const buf_t *buf);

1 0

[tor/master] net, tls: use INT_MAX - 1 in checks for buf_t
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit bb3eda8617ad06b647542da0f6d62f7dafe31a87 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 19:15:43 2020 +0000 net, tls: use INT_MAX - 1 in checks for buf_t No functionality change. --- src/lib/net/buffers_net.c | 12 ++++++------ src/lib/tls/buffers_tls.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c index aa8445107..db0179b8d 100644 --- a/src/lib/net/buffers_net.c +++ b/src/lib/net/buffers_net.c @@ -76,7 +76,7 @@ read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, chunk->datalen += read_result; log_debug(LD_NET,"Read %ld bytes. %d on inbuf.", (long)read_result, (int)buf->datalen); - tor_assert(read_result < INT_MAX); + tor_assert(read_result <= INT_MAX - 1); return (int)read_result; } } @@ -103,9 +103,9 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, tor_assert(reached_eof); tor_assert(SOCKET_OK(fd)); - if (BUG(buf->datalen >= INT_MAX)) + if (BUG(buf->datalen > INT_MAX - 1)) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + if (BUG(buf->datalen > INT_MAX - 1 - at_most)) return -1; while (at_most > total_read) { @@ -127,7 +127,7 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, check(); if (r < 0) return r; /* Error */ - tor_assert(total_read+r < INT_MAX); + tor_assert(total_read+r <= INT_MAX - 1); total_read += r; if ((size_t)r < readlen) { /* eof, block, or no more to read. */ break; @@ -170,7 +170,7 @@ flush_chunk(tor_socket_t fd, buf_t *buf, chunk_t *chunk, size_t sz, } else { *buf_flushlen -= write_result; buf_drain(buf, write_result); - tor_assert(write_result < INT_MAX); + tor_assert(write_result <= INT_MAX - 1); return (int)write_result; } } @@ -217,7 +217,7 @@ buf_flush_to_fd(buf_t *buf, int fd, size_t sz, if (r == 0 || (size_t)r < flushlen0) /* can't flush any more now. */ break; } - tor_assert(flushed < INT_MAX); + tor_assert(flushed <= INT_MAX - 1); return (int)flushed; } diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 87055744a..b1e5cb8ee 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - IF_BUG_ONCE(buf->datalen >= INT_MAX) + IF_BUG_ONCE(buf->datalen > INT_MAX - 1) return TOR_TLS_ERROR_MISC; - IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) + IF_BUG_ONCE(buf->datalen > INT_MAX - 1 - at_most) return TOR_TLS_ERROR_MISC; while (at_most > total_read) { @@ -90,7 +90,7 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) r = read_to_chunk_tls(buf, chunk, tls, readlen); if (r < 0) return r; /* Error */ - tor_assert(total_read+r < INT_MAX); + tor_assert(total_read+r <= INT_MAX - 1); total_read += r; if ((size_t)r < readlen) /* eof, block, or no more to read. */ break; @@ -177,6 +177,6 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, if (r == 0) /* Can't flush any more now. */ break; } while (sz > 0); - tor_assert(flushed < INT_MAX); + tor_assert(flushed <= INT_MAX - 1); return (int)flushed; }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1868/head'
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit cbe9e56590b0ea354313667bf20e187dd5b1d556 Merge: 3253c357e 4dd4dbf04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 29 08:32:44 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1868/head' changes/bug33131 | 3 +++ src/core/mainloop/connection.c | 6 ++++++ src/lib/buf/buffers.c | 30 +++++++++++++++--------------- src/lib/buf/buffers.h | 3 +++ src/lib/net/buffers_net.c | 12 ++++++------ src/lib/tls/buffers_tls.c | 8 ++++---- 6 files changed, 37 insertions(+), 25 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'onionk/inbufoverflow1-043' into ticket33131_044
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 4dd4dbf046693be581dd05cdae1c62e68472d18e Merge: 7f9eaec53 64a934ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 24 08:15:53 2020 -0400 Merge remote-tracking branch 'onionk/inbufoverflow1-043' into ticket33131_044 changes/bug33131 | 3 +++ src/core/mainloop/connection.c | 6 ++++++ src/lib/buf/buffers.c | 30 +++++++++++++++--------------- src/lib/buf/buffers.h | 3 +++ src/lib/net/buffers_net.c | 12 ++++++------ src/lib/tls/buffers_tls.c | 8 ++++---- 6 files changed, 37 insertions(+), 25 deletions(-)

1 0

[tor/master] buf: use BUF_MAX_LEN
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 64a934ff05575d63401fcdfdc6363df32191106c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 19:23:11 2020 +0000 buf: use BUF_MAX_LEN --- src/lib/buf/buffers.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 349242ae9..95b384bf0 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -285,7 +285,7 @@ buf_t * buf_new_with_data(const char *cp, size_t sz) { /* Validate arguments */ - if (!cp || sz <= 0 || sz > INT_MAX - 1) { + if (!cp || sz <= 0 || sz > BUF_MAX_LEN) { return NULL; } @@ -530,9 +530,9 @@ buf_add(buf_t *buf, const char *string, size_t string_len) return (int)buf->datalen; check(); - if (BUG(buf->datalen > INT_MAX - 1)) + if (BUG(buf->datalen > BUF_MAX_LEN)) return -1; - if (BUG(buf->datalen > INT_MAX - 1 - string_len)) + if (BUG(buf->datalen > BUF_MAX_LEN - string_len)) return -1; while (string_len) { @@ -551,7 +551,7 @@ buf_add(buf_t *buf, const char *string, size_t string_len) } check(); - tor_assert(buf->datalen <= INT_MAX - 1); + tor_assert(buf->datalen <= BUF_MAX_LEN); return (int)buf->datalen; } @@ -645,7 +645,7 @@ buf_get_bytes(buf_t *buf, char *string, size_t string_len) buf_peek(buf, string, string_len); buf_drain(buf, string_len); check(); - tor_assert(buf->datalen <= INT_MAX - 1); + tor_assert(buf->datalen <= BUF_MAX_LEN); return (int)buf->datalen; } @@ -660,9 +660,9 @@ buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) char b[4096]; size_t cp, len; - if (BUG(buf_out->datalen > INT_MAX - 1 || *buf_flushlen > INT_MAX - 1)) + if (BUG(buf_out->datalen > BUF_MAX_LEN || *buf_flushlen > BUF_MAX_LEN)) return -1; - if (BUG(buf_out->datalen > INT_MAX - 1 - *buf_flushlen)) + if (BUG(buf_out->datalen > BUF_MAX_LEN - *buf_flushlen)) return -1; len = *buf_flushlen; @@ -670,7 +670,7 @@ buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) len = buf_in->datalen; cp = len; /* Remember the number of bytes we intend to copy. */ - tor_assert(cp <= INT_MAX - 1); + tor_assert(cp <= BUF_MAX_LEN); while (len) { /* This isn't the most efficient implementation one could imagine, since * it does two copies instead of 1, but I kinda doubt that this will be @@ -692,9 +692,9 @@ buf_move_all(buf_t *buf_out, buf_t *buf_in) tor_assert(buf_out); if (!buf_in) return; - if (BUG(buf_out->datalen > INT_MAX - 1 || buf_in->datalen > INT_MAX - 1)) + if (BUG(buf_out->datalen > BUF_MAX_LEN || buf_in->datalen > BUF_MAX_LEN)) return; - if (BUG(buf_out->datalen > INT_MAX - 1 - buf_in->datalen)) + if (BUG(buf_out->datalen > BUF_MAX_LEN - buf_in->datalen)) return; if (buf_out->head == NULL) { @@ -748,7 +748,7 @@ buf_find_pos_of_char(char ch, buf_pos_t *out) char *cp = memchr(chunk->data+pos, ch, chunk->datalen - pos); if (cp) { out->chunk = chunk; - tor_assert(cp - chunk->data <= INT_MAX - 1); + tor_assert(cp - chunk->data <= BUF_MAX_LEN); out->pos = (int)(cp - chunk->data); return out->chunk_pos + out->pos; } else { @@ -764,7 +764,7 @@ buf_find_pos_of_char(char ch, buf_pos_t *out) static inline int buf_pos_inc(buf_pos_t *pos) { - tor_assert(pos->pos < INT_MAX - 1); + tor_assert(pos->pos < BUF_MAX_LEN); ++pos->pos; if (pos->pos == (ptrdiff_t)pos->chunk->datalen) { if (!pos->chunk->next) @@ -811,7 +811,7 @@ buf_find_string_offset(const buf_t *buf, const char *s, size_t n) buf_pos_init(buf, &pos); while (buf_find_pos_of_char(*s, &pos) >= 0) { if (buf_matches_at_pos(&pos, s, n)) { - tor_assert(pos.chunk_pos + pos.pos <= INT_MAX - 1); + tor_assert(pos.chunk_pos + pos.pos <= BUF_MAX_LEN); return (int)(pos.chunk_pos + pos.pos); } else { if (buf_pos_inc(&pos)<0) @@ -845,7 +845,7 @@ buf_find_offset_of_char(buf_t *buf, char ch) { chunk_t *chunk; ptrdiff_t offset = 0; - tor_assert(buf->datalen <= INT_MAX - 1); + tor_assert(buf->datalen <= BUF_MAX_LEN); for (chunk = buf->head; chunk; chunk = chunk->next) { char *cp = memchr(chunk->data, ch, chunk->datalen); if (cp) @@ -915,7 +915,7 @@ buf_assert_ok(buf_t *buf) for (ch = buf->head; ch; ch = ch->next) { total += ch->datalen; tor_assert(ch->datalen <= ch->memlen); - tor_assert(ch->datalen <= INT_MAX - 1); + tor_assert(ch->datalen <= BUF_MAX_LEN); tor_assert(ch->data >= &ch->mem[0]); tor_assert(ch->data <= &ch->mem[0]+ch->memlen); if (ch->data == &ch->mem[0]+ch->memlen) {

1 0

[tor/master] buf: use INT_MAX - 1 in checks
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 9ce95138980bae2947256d7b91a2a390d0cdbbb9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 19:16:36 2020 +0000 buf: use INT_MAX - 1 in checks No functionality change. --- src/lib/buf/buffers.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 09a074edc..349242ae9 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -285,7 +285,7 @@ buf_t * buf_new_with_data(const char *cp, size_t sz) { /* Validate arguments */ - if (!cp || sz <= 0 || sz >= INT_MAX) { + if (!cp || sz <= 0 || sz > INT_MAX - 1) { return NULL; } @@ -530,9 +530,9 @@ buf_add(buf_t *buf, const char *string, size_t string_len) return (int)buf->datalen; check(); - if (BUG(buf->datalen >= INT_MAX)) + if (BUG(buf->datalen > INT_MAX - 1)) return -1; - if (BUG(buf->datalen >= INT_MAX - string_len)) + if (BUG(buf->datalen > INT_MAX - 1 - string_len)) return -1; while (string_len) { @@ -551,7 +551,7 @@ buf_add(buf_t *buf, const char *string, size_t string_len) } check(); - tor_assert(buf->datalen < INT_MAX); + tor_assert(buf->datalen <= INT_MAX - 1); return (int)buf->datalen; } @@ -645,7 +645,7 @@ buf_get_bytes(buf_t *buf, char *string, size_t string_len) buf_peek(buf, string, string_len); buf_drain(buf, string_len); check(); - tor_assert(buf->datalen < INT_MAX); + tor_assert(buf->datalen <= INT_MAX - 1); return (int)buf->datalen; } @@ -660,9 +660,9 @@ buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) char b[4096]; size_t cp, len; - if (BUG(buf_out->datalen >= INT_MAX || *buf_flushlen >= INT_MAX)) + if (BUG(buf_out->datalen > INT_MAX - 1 || *buf_flushlen > INT_MAX - 1)) return -1; - if (BUG(buf_out->datalen >= INT_MAX - *buf_flushlen)) + if (BUG(buf_out->datalen > INT_MAX - 1 - *buf_flushlen)) return -1; len = *buf_flushlen; @@ -670,7 +670,7 @@ buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) len = buf_in->datalen; cp = len; /* Remember the number of bytes we intend to copy. */ - tor_assert(cp < INT_MAX); + tor_assert(cp <= INT_MAX - 1); while (len) { /* This isn't the most efficient implementation one could imagine, since * it does two copies instead of 1, but I kinda doubt that this will be @@ -692,9 +692,9 @@ buf_move_all(buf_t *buf_out, buf_t *buf_in) tor_assert(buf_out); if (!buf_in) return; - if (BUG(buf_out->datalen >= INT_MAX || buf_in->datalen >= INT_MAX)) + if (BUG(buf_out->datalen > INT_MAX - 1 || buf_in->datalen > INT_MAX - 1)) return; - if (BUG(buf_out->datalen >= INT_MAX - buf_in->datalen)) + if (BUG(buf_out->datalen > INT_MAX - 1 - buf_in->datalen)) return; if (buf_out->head == NULL) { @@ -748,7 +748,7 @@ buf_find_pos_of_char(char ch, buf_pos_t *out) char *cp = memchr(chunk->data+pos, ch, chunk->datalen - pos); if (cp) { out->chunk = chunk; - tor_assert(cp - chunk->data < INT_MAX); + tor_assert(cp - chunk->data <= INT_MAX - 1); out->pos = (int)(cp - chunk->data); return out->chunk_pos + out->pos; } else { @@ -811,7 +811,7 @@ buf_find_string_offset(const buf_t *buf, const char *s, size_t n) buf_pos_init(buf, &pos); while (buf_find_pos_of_char(*s, &pos) >= 0) { if (buf_matches_at_pos(&pos, s, n)) { - tor_assert(pos.chunk_pos + pos.pos < INT_MAX); + tor_assert(pos.chunk_pos + pos.pos <= INT_MAX - 1); return (int)(pos.chunk_pos + pos.pos); } else { if (buf_pos_inc(&pos)<0) @@ -845,7 +845,7 @@ buf_find_offset_of_char(buf_t *buf, char ch) { chunk_t *chunk; ptrdiff_t offset = 0; - tor_assert(buf->datalen < INT_MAX); + tor_assert(buf->datalen <= INT_MAX - 1); for (chunk = buf->head; chunk; chunk = chunk->next) { char *cp = memchr(chunk->data, ch, chunk->datalen); if (cp) @@ -915,7 +915,7 @@ buf_assert_ok(buf_t *buf) for (ch = buf->head; ch; ch = ch->next) { total += ch->datalen; tor_assert(ch->datalen <= ch->memlen); - tor_assert(ch->datalen < INT_MAX); + tor_assert(ch->datalen <= INT_MAX - 1); tor_assert(ch->data >= &ch->mem[0]); tor_assert(ch->data <= &ch->mem[0]+ch->memlen); if (ch->data == &ch->mem[0]+ch->memlen) {

1 0

[tor/master] net, tls: use BUF_MAX_LEN
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 9e988406c7a12a9b46f5aa0344eb2e07500740ed Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 12 19:20:23 2020 +0000 net, tls: use BUF_MAX_LEN --- src/lib/net/buffers_net.c | 12 ++++++------ src/lib/tls/buffers_tls.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c index db0179b8d..4dbf491e1 100644 --- a/src/lib/net/buffers_net.c +++ b/src/lib/net/buffers_net.c @@ -76,7 +76,7 @@ read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, chunk->datalen += read_result; log_debug(LD_NET,"Read %ld bytes. %d on inbuf.", (long)read_result, (int)buf->datalen); - tor_assert(read_result <= INT_MAX - 1); + tor_assert(read_result <= BUF_MAX_LEN); return (int)read_result; } } @@ -103,9 +103,9 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, tor_assert(reached_eof); tor_assert(SOCKET_OK(fd)); - if (BUG(buf->datalen > INT_MAX - 1)) + if (BUG(buf->datalen > BUF_MAX_LEN)) return -1; - if (BUG(buf->datalen > INT_MAX - 1 - at_most)) + if (BUG(buf->datalen > BUF_MAX_LEN - at_most)) return -1; while (at_most > total_read) { @@ -127,7 +127,7 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, check(); if (r < 0) return r; /* Error */ - tor_assert(total_read+r <= INT_MAX - 1); + tor_assert(total_read+r <= BUF_MAX_LEN); total_read += r; if ((size_t)r < readlen) { /* eof, block, or no more to read. */ break; @@ -170,7 +170,7 @@ flush_chunk(tor_socket_t fd, buf_t *buf, chunk_t *chunk, size_t sz, } else { *buf_flushlen -= write_result; buf_drain(buf, write_result); - tor_assert(write_result <= INT_MAX - 1); + tor_assert(write_result <= BUF_MAX_LEN); return (int)write_result; } } @@ -217,7 +217,7 @@ buf_flush_to_fd(buf_t *buf, int fd, size_t sz, if (r == 0 || (size_t)r < flushlen0) /* can't flush any more now. */ break; } - tor_assert(flushed <= INT_MAX - 1); + tor_assert(flushed <= BUF_MAX_LEN); return (int)flushed; } diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index b1e5cb8ee..b92a14d6a 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - IF_BUG_ONCE(buf->datalen > INT_MAX - 1) + IF_BUG_ONCE(buf->datalen > BUF_MAX_LEN) return TOR_TLS_ERROR_MISC; - IF_BUG_ONCE(buf->datalen > INT_MAX - 1 - at_most) + IF_BUG_ONCE(buf->datalen > BUF_MAX_LEN - at_most) return TOR_TLS_ERROR_MISC; while (at_most > total_read) { @@ -90,7 +90,7 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) r = read_to_chunk_tls(buf, chunk, tls, readlen); if (r < 0) return r; /* Error */ - tor_assert(total_read+r <= INT_MAX - 1); + tor_assert(total_read+r <= BUF_MAX_LEN); total_read += r; if ((size_t)r < readlen) /* eof, block, or no more to read. */ break; @@ -177,6 +177,6 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, if (r == 0) /* Can't flush any more now. */ break; } while (sz > 0); - tor_assert(flushed <= INT_MAX - 1); + tor_assert(flushed <= BUF_MAX_LEN); return (int)flushed; }

1 0

[tor/master] Run "make autostyle"
by teor＠torproject.org 29 Apr '20

29 Apr '20

commit 3253c357eeae3434da62bf720a451aa19f0ddd32 Author: teor <teor(a)torproject.org> Date: Wed Apr 29 22:07:35 2020 +1000 Run "make autostyle" --- src/feature/dircache/conscache.c | 2 +- src/feature/hs/hs_opts_st.h | 2 +- src/lib/crypt_ops/crypto_rsa_openssl.c | 8 ++++---- src/lib/subsys/subsys.h | 2 +- src/test/test_circuitbuild.c | 2 +- src/test/test_dir.c | 4 ++-- src/test/test_hs_intropoint.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/feature/dircache/conscache.c b/src/feature/dircache/conscache.c index d9aaccddc..2a831aa44 100644 --- a/src/feature/dircache/conscache.c +++ b/src/feature/dircache/conscache.c @@ -139,7 +139,7 @@ consensus_cache_may_overallocate(consensus_cache_t *cache) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" #endif -#endif +#endif /* defined(_WIN32) */ /** * Tell the sandbox (if any) configured by cfg to allow the diff --git a/src/feature/hs/hs_opts_st.h b/src/feature/hs/hs_opts_st.h index f6ee0f3cf..279f0d6da 100644 --- a/src/feature/hs/hs_opts_st.h +++ b/src/feature/hs/hs_opts_st.h @@ -27,4 +27,4 @@ **/ typedef struct hs_opts_t hs_opts_t; -#endif +#endif /* !defined(TOR_FEATURE_HS_HS_OPTS_ST_H) */ diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c b/src/lib/crypt_ops/crypto_rsa_openssl.c index d54db43b9..c96ee81fd 100644 --- a/src/lib/crypt_ops/crypto_rsa_openssl.c +++ b/src/lib/crypt_ops/crypto_rsa_openssl.c @@ -583,15 +583,15 @@ rsa_private_key_too_long(RSA *rsa, int max_bits) dmp1 = RSA_get0_dmp1(rsa); dmq1 = RSA_get0_dmq1(rsa); iqmp = RSA_get0_iqmp(rsa); -#else +#else /* !(OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)) */ /* The accessors above did not exist in openssl 1.1.0. */ p = q = dmp1 = dmq1 = iqmp = NULL; RSA_get0_key(rsa, &n, &e, &d); -#endif +#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) */ if (RSA_bits(rsa) > max_bits) return true; -#else +#else /* !defined(OPENSSL_1_1_API) */ n = rsa->n; e = rsa->e; p = rsa->p; @@ -600,7 +600,7 @@ rsa_private_key_too_long(RSA *rsa, int max_bits) dmp1 = rsa->dmp1; dmq1 = rsa->dmq1; iqmp = rsa->iqmp; -#endif +#endif /* defined(OPENSSL_1_1_API) */ if (n && BN_num_bits(n) > max_bits) return true; diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index b29015746..62c0de026 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -198,7 +198,7 @@ typedef struct subsys_fns_t { **/ #define SUBSYS_DECLARE_LOCATION() \ .location = __FILE__ -#endif +#endif /* !defined(COCCI) */ /** * Lowest allowed subsystem level. diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index 6934cf3d7..061f39937 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -133,7 +133,7 @@ test_new_route_len_unhandled_exit(void *arg) #if !defined(__COVERITY__) && !defined(__clang_analyzer__) tt_skip(); #endif -#endif +#endif /* defined(ALL_BUGS_ARE_FATAL) */ MOCK(count_acceptable_nodes, mock_count_acceptable_nodes); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index bf9a04b07..3a0b8237c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3041,7 +3041,7 @@ test_dir_param_voting_lookup(void *arg) tt_str_op(smartlist_get(tor_get_captured_bug_log_(), 0), OP_EQ, "!(!ok)"); tor_end_capture_bugs_(); -#endif +#endif /* !defined(ALL_BUGS_ARE_FATAL) */ done: SMARTLIST_FOREACH(lst, char *, cp, tor_free(cp)); @@ -4997,7 +4997,7 @@ test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg) #if !defined(__COVERITY__) && !defined(__clang_analyzer__) tt_skip(); #endif -#endif +#endif /* defined(ALL_BUGS_ARE_FATAL) */ tor_capture_bugs_(1); setup_full_capture_of_logs(LOG_WARN); diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 3b6e3fd21..e6b27d7a5 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -764,7 +764,7 @@ test_introduce1_validation(void *arg) ret = validate_introduce1_parsed_cell(cell); tor_end_capture_bugs_(); tt_int_op(ret, OP_EQ, -1); -#endif +#endif /* !defined(ALL_BUGS_ARE_FATAL) */ /* Reset legacy ID and make sure it's correct. */ memset(cell->legacy_key_id, 0, sizeof(cell->legacy_key_id));

1 0

[tor/master] nodelist: Remove an outdated comment
by teor＠torproject.org 29 Apr '20

29 Apr '20

commit 398e0e02474b988fd8600117eaece182a295b546 Author: teor <teor(a)torproject.org> Date: Wed Apr 29 15:53:27 2020 +1000 nodelist: Remove an outdated comment Part of 33817. --- src/feature/nodelist/routerinfo_st.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/feature/nodelist/routerinfo_st.h b/src/feature/nodelist/routerinfo_st.h index e54a444ec..36ead50e3 100644 --- a/src/feature/nodelist/routerinfo_st.h +++ b/src/feature/nodelist/routerinfo_st.h @@ -26,9 +26,6 @@ struct routerinfo_t { uint16_t dir_port; /**< Port for HTTP directory connections. */ /** A router's IPv6 address, if it has one. */ - /* XXXXX187 Actually these should probably be part of a list of addresses, - * not just a special case. Use abstractions to access these; don't do it - * directly. */ tor_addr_t ipv6_addr; uint16_t ipv6_orport;

1 0

[tor/master] rand: Clarify the crypto_rand_uint() range
by teor＠torproject.org 29 Apr '20

29 Apr '20

commit 6eec43161ad9e072d82da88163e748566b39d127 Author: teor <teor(a)torproject.org> Date: Wed Apr 29 15:57:44 2020 +1000 rand: Clarify the crypto_rand_uint() range --- src/lib/crypt_ops/crypto_rand_numeric.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/crypto_rand_numeric.c b/src/lib/crypt_ops/crypto_rand_numeric.c index ffbfa2d56..b2516c4bd 100644 --- a/src/lib/crypt_ops/crypto_rand_numeric.c +++ b/src/lib/crypt_ops/crypto_rand_numeric.c @@ -33,8 +33,8 @@ /** * Return a pseudorandom integer chosen uniformly from the values between 0 - * and limit-1 inclusive. limit must be strictly between 0 and - * UINT_MAX. */ + * and limit-1 inclusive. limit must be strictly greater than 0, and + * less than UINT_MAX. */ unsigned crypto_rand_uint(unsigned limit) {

1 0