- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] update tbb osx alpha to 2.2.28, bump tor to 0.2.2.28-beta, libevent to 2.0.12-stable, and extension versions as well
by erinn＠torproject.org 09 Jun '11

09 Jun '11

commit a2d694a6924140f73cef1549588c9b2b92e5dc63 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jun 9 04:00:18 2011 -0300 update tbb osx alpha to 2.2.28, bump tor to 0.2.2.28-beta, libevent to 2.0.12-stable, and extension versions as well --- README.OSX-2.2 | 6 +++--- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 +++++--- changelog.osx-2.2 | 7 +++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index d6a1914..b8d2fc5 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.27-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Tumucumaque) 4.0.1 \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.0.5 + |_ NoScript 2.1.1 |_ HTTPS-Everywhere 0.9.9.development.5 - |_ BetterPrivacy 1.50 + |_ BetterPrivacy 1.51 Usage ----- diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8bee9e1..12d790c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -144,7 +144,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.27-1-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 554d746..777afe1 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,16 +1,18 @@ #!/usr/bin/make +RELEASE_VER=2.2.28 + HTTPSEVERY_VER=0.9.9.development.5 FIREFOX_VER=4.0.1 -LIBEVENT_VER=2.0.10-stable +LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.0.5 +NOSCRIPT_VER=2.1.1 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.27-beta +TOR_VER=0.2.2.28-beta TORBUTTON_VER=1.3.3-alpha VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d30069f..6dffa27 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.28-1) alpha; suite=osx + + * Update Tor to 0.2.2.28-beta + * Update Libevent to 2.0.12-stable + * Update NoScript to 2.1.1 + * Update BetterPrivacy to 1.51 + Tor Browser Bundle (2.2.27-1) alpha; suite=osx * Update Tor to 0.2.2.27-beta

1 0

[obfsproxy/master] Fixed SOCKS function return values.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 457e03d5b27ebbd4fba1f804b6f0e6661d5b164e Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 05:03:12 2011 +0200 Fixed SOCKS function return values. SOCKS functions reporting to network.c were not consistent on returning enum req_status values. This commit makes all callees of handle_socks() return req_status. It also renames req_status itself to socks_ret! --- src/network.c | 12 ++++---- src/socks.c | 74 +++++++++++++++++++++++++++++--------------------------- src/socks.h | 13 ++++----- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/network.c b/src/network.c index f1c4584..07ef767 100644 --- a/src/network.c +++ b/src/network.c @@ -230,7 +230,7 @@ socks_read_cb(struct bufferevent *bev, void *arg) { conn_t *conn = arg; //struct bufferevent *other; - enum req_status r; + enum socks_ret socks_ret; assert(bev == conn->input); /* socks must be on the initial bufferevent */ //dbg(("Got data on the socks side (%d) \n", conn->socks_state->state)); @@ -261,15 +261,15 @@ socks_read_cb(struct bufferevent *bev, void *arg) return; } - r = handle_socks(bufferevent_get_input(bev), + socks_ret = handle_socks(bufferevent_get_input(bev), bufferevent_get_output(bev), conn->socks_state); - } while (r == SOCKS_GOOD); + } while (socks_ret == SOCKS_GOOD); - if (r == SOCKS_INCOMPLETE) + if (socks_ret == SOCKS_INCOMPLETE) return; /* need to read more data. */ - else if (r == SOCKS_BROKEN) + else if (socks_ret == SOCKS_BROKEN) conn_free(conn); /* XXXX maybe send socks reply */ - else if (r == SOCKS_CMD_NOT_CONNECT) { + else if (socks_ret == SOCKS_CMD_NOT_CONNECT) { bufferevent_enable(bev, EV_WRITE); bufferevent_disable(bev, EV_READ); socks5_send_reply(bufferevent_get_output(bev), conn->socks_state, diff --git a/src/socks.c b/src/socks.c index 8782a63..6266503 100644 --- a/src/socks.c +++ b/src/socks.c @@ -39,7 +39,7 @@ */ -static int socks5_do_negotiation(struct evbuffer *dest, +static enum socks_ret socks5_do_negotiation(struct evbuffer *dest, unsigned int neg_was_success); typedef unsigned char uchar; @@ -118,7 +118,7 @@ socks_errno_to_reply(socks_state_t *state, int error) Client Request (Client -> Server) */ -enum req_status +enum socks_ret socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) { /** XXX: max FQDN size is 255. */ @@ -284,7 +284,7 @@ socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, nmethods | methods[nmethods] | b 1-255b */ -int +enum socks_ret socks5_handle_negotiation(struct evbuffer *source, struct evbuffer *dest, socks_state_t *state) { @@ -295,7 +295,7 @@ socks5_handle_negotiation(struct evbuffer *source, evbuffer_copyout(source, &nmethods, 1); if (evbuffer_get_length(source) < nmethods + 1) { - return 0; /* need more data */ + return SOCKS_INCOMPLETE; /* need more data */ } evbuffer_drain(source, 1); @@ -305,7 +305,7 @@ socks5_handle_negotiation(struct evbuffer *source, p = malloc(nmethods); if (!p) { printf("malloc failed!\n"); - return -1; + return SOCKS_BROKEN; } if (evbuffer_remove(source, p, nmethods) < 0) assert(0); @@ -333,7 +333,7 @@ socks5_handle_negotiation(struct evbuffer *source, | version | method selected | 1b 1b */ -static int +static enum socks_ret socks5_do_negotiation(struct evbuffer *dest, unsigned int neg_was_success) { uchar reply[2]; @@ -342,13 +342,13 @@ socks5_do_negotiation(struct evbuffer *dest, unsigned int neg_was_success) reply[1] = neg_was_success ? SOCKS5_METHOD_NOAUTH : SOCKS5_METHOD_FAIL; if (evbuffer_add(dest, reply, 2) == -1 || !neg_was_success) - return -1; + return SOCKS_BROKEN; else - return 1; + return SOCKS_GOOD; } /* rename to socks4_handle_request or something. */ -int +enum socks_ret socks4_read_request(struct evbuffer *source, socks_state_t *state) { /* Format is: @@ -365,11 +365,11 @@ socks4_read_request(struct evbuffer *source, socks_state_t *state) struct evbuffer_ptr end_of_user, end_of_hostname; size_t user_len, hostname_len=0; if (evbuffer_get_length(source) < 7) - return 0; /* more bytes needed */ + return SOCKS_INCOMPLETE; /* more bytes needed */ evbuffer_copyout(source, (char*)header, 7); if (header[0] != 1) { printf("socks: Only CONNECT supported.\n"); - return -1; + return SOCKS_BROKEN; } memcpy(&portnum, header+1, 2); memcpy(&ipaddr, header+3, 4); @@ -381,25 +381,25 @@ socks4_read_request(struct evbuffer *source, socks_state_t *state) end_of_user = evbuffer_search(source, "\0", 1, &end_of_user); if (end_of_user.pos == -1) { if (evbuffer_get_length(source) > SOCKS4_MAX_LENGTH) - return -1; - return 0; + return SOCKS_BROKEN; + return SOCKS_INCOMPLETE; } user_len = end_of_user.pos - 7; if (is_v4a) { if (end_of_user.pos == evbuffer_get_length(source)-1) - return 0; /*more data needed */ + return SOCKS_INCOMPLETE; /*more data needed */ end_of_hostname = end_of_user; evbuffer_ptr_set(source, &end_of_hostname, 1, EVBUFFER_PTR_ADD); end_of_hostname = evbuffer_search(source, "\0", 1, &end_of_hostname); if (end_of_hostname.pos == -1) { if (evbuffer_get_length(source) > SOCKS4_MAX_LENGTH) - return -1; - return 0; + return SOCKS_BROKEN; + return SOCKS_INCOMPLETE; } hostname_len = end_of_hostname.pos - end_of_user.pos - 1; if (hostname_len >= sizeof(state->parsereq.addr)) { printf("socks4a: Hostname too long\n"); - return -1; + return SOCKS_BROKEN; } } @@ -415,10 +415,10 @@ socks4_read_request(struct evbuffer *source, socks_state_t *state) struct in_addr in; in.s_addr = htonl(ipaddr); if (evutil_inet_ntop(AF_INET, &in, state->parsereq.addr, sizeof(state->parsereq.addr)) == NULL) - return -1; + return SOCKS_BROKEN; } - return 1; + return SOCKS_GOOD; } int @@ -451,17 +451,18 @@ socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) Returns 1 on done, -1 on unrecoverable error, 0 on "need more bytes */ -int +enum socks_ret handle_socks(struct evbuffer *source, struct evbuffer *dest, socks_state_t *socks_state) { - enum req_status r; + enum socks_ret r; + if (socks_state->broken) - return -1; + return SOCKS_BROKEN; if (evbuffer_get_length(source) < MIN_SOCKS_PACKET) { printf("socks: Packet is too small.\n"); - return 0; + return SOCKS_INCOMPLETE; } /* ST_SENT_REPLY connections shouldn't be here! */ @@ -483,48 +484,49 @@ handle_socks(struct evbuffer *source, struct evbuffer *dest, case SOCKS4_VERSION: if (socks_state->state == ST_WAITING) { r = socks4_read_request(source, socks_state); - if (r == -1) + if (r == SOCKS_BROKEN) goto broken; - else if (r == 0) - return 0; + else if (r == SOCKS_INCOMPLETE) + return SOCKS_INCOMPLETE; socks_state->state = ST_HAVE_ADDR; - return 1; + return SOCKS_GOOD; } break; case SOCKS5_VERSION: if (socks_state->state == ST_WAITING) { /* We don't know this connection. We have to do method negotiation. */ r = socks5_handle_negotiation(source,dest,socks_state); - if (r == -1) + if (r == SOCKS_BROKEN) goto broken; - else if (r == 0) - return 0; - else if (r == 1) + else if (r == SOCKS_INCOMPLETE) + return SOCKS_INCOMPLETE; + else if (r == SOCKS_GOOD) socks_state->state = ST_NEGOTIATION_DONE; } if (socks_state->state == ST_NEGOTIATION_DONE) { /* We know this connection. Let's see what it wants. */ r = socks5_handle_request(source,&socks_state->parsereq); - if (r == SOCKS_GOOD) + if (r == SOCKS_GOOD) { socks_state->state = ST_HAVE_ADDR; - else if (r == SOCKS_INCOMPLETE) + return SOCKS_GOOD; + } else if (r == SOCKS_INCOMPLETE) return SOCKS_INCOMPLETE; else if (r == SOCKS_CMD_NOT_CONNECT) { socks_state->broken = 1; return SOCKS_CMD_NOT_CONNECT; } else if (r == SOCKS_BROKEN) goto broken; - return r; + assert(0); } break; default: goto broken; } - return 0; + return SOCKS_INCOMPLETE; broken: socks_state->broken = 1; - return -1; + return SOCKS_BROKEN; } enum socks_status_t diff --git a/src/socks.h b/src/socks.h index 7b35cb5..f686253 100644 --- a/src/socks.h +++ b/src/socks.h @@ -17,15 +17,15 @@ enum socks_status_t { ST_SENT_REPLY }; -enum req_status { +enum socks_ret { SOCKS_GOOD=0, SOCKS_INCOMPLETE, SOCKS_CMD_NOT_CONNECT, SOCKS_BROKEN }; -int handle_socks(struct evbuffer *source, - struct evbuffer *dest, socks_state_t *socks_state); +enum socks_ret handle_socks(struct evbuffer *source, + struct evbuffer *dest, socks_state_t *socks_state); socks_state_t *socks_state_new(void); void socks_state_free(socks_state_t *s); @@ -96,14 +96,13 @@ struct socks_state_t { struct parsereq parsereq; }; -int socks5_handle_negotiation(struct evbuffer *source, +enum socks_ret socks5_handle_negotiation(struct evbuffer *source, struct evbuffer *dest, socks_state_t *state); int socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, int status); -enum req_status socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); +enum socks_ret socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); - -int socks4_read_request(struct evbuffer *source, socks_state_t *state); +enum socks_ret socks4_read_request(struct evbuffer *source, socks_state_t *state); int socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status); #endif

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug3359'
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit f949faca8c0664400a50c30d2433408514938e4f Merge: b1e2ee5 8b198c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 9 02:31:45 2011 -0400 Merge remote-tracking branch 'asn/bug3359' src/network.c | 12 ++++---- src/socks.c | 74 +++++++++++++++++++++++---------------------- src/socks.h | 13 ++++---- src/test/unittest_socks.c | 22 +++++++------- 4 files changed, 61 insertions(+), 60 deletions(-)

1 0

[obfsproxy/master] Revive unit tests.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 8b198c960b9791623dff0a52deeb37ba88d92671 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 04:56:32 2011 +0200 Revive unit tests. --- src/test/unittest_socks.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index d7706ee..d82964f 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -40,7 +40,7 @@ test_socks_socks5_send_negotiation(void *data) evbuffer_add(source, req1, 2); - tt_int_op(1, ==, socks5_handle_negotiation(source,dest,state)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); tt_int_op(0, ==, evbuffer_get_length(source)); uchar rep1[2]; @@ -57,7 +57,7 @@ test_socks_socks5_send_negotiation(void *data) evbuffer_add(source, req2, 10); - tt_int_op(1, ==, socks5_handle_negotiation(source,dest,state)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); tt_int_op(0, ==, evbuffer_get_length(source)); uchar rep2[2]; @@ -73,7 +73,7 @@ test_socks_socks5_send_negotiation(void *data) evbuffer_add(source, req3, 100); - tt_int_op(-1, ==, socks5_handle_negotiation(source,dest,state)); + tt_int_op(SOCKS_BROKEN, ==, socks5_handle_negotiation(source,dest,state)); tt_int_op(0, ==, evbuffer_get_length(source)); /* all data removed */ uchar rep3[2]; @@ -92,7 +92,7 @@ test_socks_socks5_send_negotiation(void *data) evbuffer_add(source, req4, 4); - tt_int_op(0, ==, socks5_handle_negotiation(source,dest,state)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_negotiation(source,dest,state)); tt_int_op(4, ==, evbuffer_get_length(source)); /* no bytes removed */ evbuffer_drain(source, 4); @@ -105,7 +105,7 @@ test_socks_socks5_send_negotiation(void *data) evbuffer_add(source, req5, 5); - tt_int_op(1, ==, socks5_handle_negotiation(source,dest,state)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_negotiation(source,dest,state)); tt_int_op(1, ==, evbuffer_get_length(source)); /* 4 bytes removed */ evbuffer_drain(source, 1); @@ -431,7 +431,7 @@ test_socks_socks4_request(void *data) evbuffer_add(source,req1,8); - tt_int_op(1, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); tt_int_op(state->parsereq.port, ==, 80); @@ -449,7 +449,7 @@ test_socks_socks4_request(void *data) evbuffer_add(source,req2,9); - tt_int_op(0, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(source,state)); /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); @@ -465,7 +465,7 @@ test_socks_socks4_request(void *data) evbuffer_add(source,req3,16); - tt_int_op(1, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); tt_int_op(state->parsereq.port, ==, 80); @@ -485,7 +485,7 @@ test_socks_socks4_request(void *data) evbuffer_add(source,req4,33); - tt_int_op(1, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_GOOD, ==, socks4_read_request(source,state)); tt_str_op(state->parsereq.addr, ==, "www.test.example"); tt_int_op(state->parsereq.port, ==, 80); @@ -505,7 +505,7 @@ test_socks_socks4_request(void *data) /* Don't send it all. */ evbuffer_add(source,req5,28); - tt_int_op(0, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks4_read_request(source,state)); /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); @@ -525,7 +525,7 @@ test_socks_socks4_request(void *data) evbuffer_add(source,req6,16+HUGE+1); - tt_int_op(-1, ==, socks4_read_request(source,state)); + tt_int_op(SOCKS_BROKEN, ==, socks4_read_request(source,state)); #undef HUGE end:

1 0

[tor/master] Prefer tt_assert in unit tests, not tor_assert
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit b2e7c356dbbf746b263f56fbc7e808c71dd7264e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 20:33:53 2011 -0400 Prefer tt_assert in unit tests, not tor_assert --- changes/prefer_tt_assert | 4 ++++ src/test/test_crypto.c | 24 ++++++++++++------------ src/test/test_dir.c | 4 ++-- src/test/test_util.c | 22 +++++++++++----------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/changes/prefer_tt_assert b/changes/prefer_tt_assert new file mode 100644 index 0000000..4fdb636 --- /dev/null +++ b/changes/prefer_tt_assert @@ -0,0 +1,4 @@ + o Code simplifications and refactoring (tests): + - Use tt_assert, not tor_assert, for checking for test failures. + This makes the unit tests more able to go on in the event that + one of them fails. diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 121af27..dca0d3a 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -630,7 +630,7 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 4095); - tor_assert(encrypted_size > 0); /* This is obviously true, since 4111 is + tt_assert(encrypted_size > 0); /* This is obviously true, since 4111 is * greater than 0, but its truth is not * obvious to all analysis tools. */ cipher = crypto_create_init_cipher(key1, 0); @@ -639,7 +639,7 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 4095); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain, decrypted1, 4095); /* Encrypt a second time (with a new random initialization vector). */ cipher = crypto_create_init_cipher(key1, 1); @@ -648,14 +648,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 4095); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted2, 4095, encrypted2, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 4095); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain, decrypted2, 4095); test_memneq(encrypted1, encrypted2, encrypted_size); /* Decrypt with the wrong key. */ @@ -680,14 +680,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 1); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 1, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 1); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_1, decrypted1, 1); /* Special length case: 15. */ cipher = crypto_create_init_cipher(key1, 1); @@ -696,14 +696,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 15); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 15, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 15); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_15, decrypted1, 15); /* Special length case: 16. */ cipher = crypto_create_init_cipher(key1, 1); @@ -712,14 +712,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 16); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 16, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 16); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_16, decrypted1, 16); /* Special length case: 17. */ cipher = crypto_create_init_cipher(key1, 1); @@ -728,12 +728,12 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 17); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 17, encrypted1, encrypted_size); test_eq(decrypted_size, 17); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_17, decrypted1, 17); done: diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4b86be4..4bbf768 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1169,10 +1169,10 @@ test_dir_v3_networkstatus(void) /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3); - tor_assert(detached_text1); + tt_assert(detached_text1); /* Try to parse it. */ dsig1 = networkstatus_parse_detached_signatures(detached_text1, NULL); - tor_assert(dsig1); + tt_assert(dsig1); /* Are parsed values as expected? */ test_eq(dsig1->valid_after, con3->valid_after); diff --git a/src/test/test_util.c b/src/test/test_util.c index afc4d5c..c4769e6 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -376,7 +376,7 @@ test_util_strmisc(void) /* Test memmem and memstr */ { const char *haystack = "abcde"; - tor_assert(!tor_memmem(haystack, 5, "ef", 2)); + tt_assert(!tor_memmem(haystack, 5, "ef", 2)); test_eq_ptr(tor_memmem(haystack, 5, "cd", 2), haystack + 2); test_eq_ptr(tor_memmem(haystack, 5, "cde", 3), haystack + 2); haystack = "ababcad"; @@ -640,26 +640,26 @@ test_util_gzip(void) tor_strdup("String with low redundancy that won't be compressed much."); test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, ZLIB_METHOD)); - tor_assert(len1>16); + tt_assert(len1>16); /* when we allow an incomplete string, we should succeed.*/ - tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, + tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, ZLIB_METHOD, 0, LOG_INFO)); buf3[len2]='\0'; - tor_assert(len2 > 5); - tor_assert(!strcmpstart(buf1, buf3)); + tt_assert(len2 > 5); + tt_assert(!strcmpstart(buf1, buf3)); /* when we demand a complete string, this must fail. */ tor_free(buf3); - tor_assert(tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, + tt_assert(tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, ZLIB_METHOD, 1, LOG_INFO)); - tor_assert(!buf3); + tt_assert(!buf3); /* Now, try streaming compression. */ tor_free(buf1); tor_free(buf2); tor_free(buf3); state = tor_zlib_new(1, ZLIB_METHOD); - tor_assert(state); + tt_assert(state); cp1 = buf1 = tor_malloc(1024); len1 = 1024; ccp2 = "ABCDEFGHIJABCDEFGHIJ"; @@ -676,7 +676,7 @@ test_util_gzip(void) test_eq(len2, 0); test_assert(cp1 > cp2); /* Make sure we really added something. */ - tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1, + tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1, ZLIB_METHOD, 1, LOG_WARN)); test_streq(buf3, "ABCDEFGHIJABCDEFGHIJ"); /*Make sure it compressed right.*/ @@ -1397,7 +1397,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stdout */ pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0); - tor_assert(pos >= 0); + tt_assert(pos >= 0); stdout_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_out)); tt_str_op(stdout_buf, ==, expected_out); @@ -1412,7 +1412,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stderr */ pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0); - tor_assert(pos >= 0); + tt_assert(pos >= 0); stderr_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_err)); tt_str_op(stderr_buf, ==, expected_err);

1 0

[tor/master] Fix a minor coverity-found bug in tests
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 3bf808c3410a18508a70737329b0930f1693e262 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 19:58:27 2011 +0200 Fix a minor coverity-found bug in tests --- changes/coverity_master | 4 ++++ src/test/test_util.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master new file mode 100644 index 0000000..3b61087 --- /dev/null +++ b/changes/coverity_master @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Prevent using negative indices during unit test runs when read_all() + fails. Spotted by coverity. Bugfix on 0.2.3.1. + diff --git a/src/test/test_util.c b/src/test/test_util.c index d338bba..afc4d5c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1397,6 +1397,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stdout */ pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0); + tor_assert(pos >= 0); stdout_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_out)); tt_str_op(stdout_buf, ==, expected_out); @@ -1411,6 +1412,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stderr */ pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0); + tor_assert(pos >= 0); stderr_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_err)); tt_str_op(stderr_buf, ==, expected_err);

1 0

[tor/master] Update the uptime string to include an hours indicator
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit da3256b5aefb4cad706d9f239c9743ca396564c4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon May 16 21:58:01 2011 +0200 Update the uptime string to include an hours indicator Before, it wasn't really obvious if one meant hours:minutes or minutes:seconds etc. --- src/or/status.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index 34a27b2..c8bc070 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -39,13 +39,15 @@ secs_to_uptime(long secs) switch (days) { case 0: - tor_asprintf(&uptime_string, "%d:%02d", hours, minutes); + tor_asprintf(&uptime_string, "%d:%02d hours", hours, minutes); break; case 1: - tor_asprintf(&uptime_string, "%ld day %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld day %d:%02d hours", + days, hours, minutes); break; default: - tor_asprintf(&uptime_string, "%ld days %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld days %d:%02d hours", + days, hours, minutes); break; }

1 0

[tor/master] Remove a dead variable in the heartbeat code
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 3033f8459b332c934b3098ee15c3aa04e3545484 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:10:43 2011 +0200 Remove a dead variable in the heartbeat code --- changes/coverity_master | 2 ++ src/or/status.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 3b61087..ab174bc 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,4 +1,6 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + o Code simplifications and refactoring: + - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/status.c b/src/or/status.c index c8bc070..64e3022 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -84,7 +84,6 @@ log_heartbeat(time_t now) char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; - const node_t *myself; or_options_t *options = get_options(); (void)now; @@ -94,7 +93,7 @@ log_heartbeat(time_t now) if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ else - if (!(myself = node_get_by_id(me->cache_info.identity_digest))) + if (!node_get_by_id(me->cache_info.identity_digest)) log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: It seems like we are not " "in the cached consensus."); }

1 0

[tor/master] Fix a memleak in nodelist_assert_ok()
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 82837673655151609462d529986a310e04f1ba50 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:38:42 2011 +0200 Fix a memleak in nodelist_assert_ok() --- changes/coverity_master | 2 ++ src/or/nodelist.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index ab174bc..784dec3 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,6 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + - Fix a rare memory leak when checking the nodelist without it being + present. Found by coverity. Bugfix on 0.2.3.1. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 0856b31..8cded8f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -342,11 +342,13 @@ nodelist_assert_ok(void) { routerlist_t *rl = router_get_routerlist(); networkstatus_t *ns = networkstatus_get_latest_consensus(); - digestmap_t *dm = digestmap_new(); + digestmap_t *dm; if (!the_nodelist) return; + dm = digestmap_new(); + /* every routerinfo in rl->routers should be in the nodelist. */ if (rl) { SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {

1 0

[tor/master] tweak coverity_master changes file
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 2fd56030574730549c7546bd54d1ec94ee308ed0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 20:29:10 2011 -0400 tweak coverity_master changes file --- changes/coverity_master | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 784dec3..43ce1fd 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,8 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() - fails. Spotted by coverity. Bugfix on 0.2.3.1. + fails. Spotted by coverity. Bugfix on 0.2.3.1-alppa. - Fix a rare memory leak when checking the nodelist without it being - present. Found by coverity. Bugfix on 0.2.3.1. + present. Found by coverity. Bugfix on 0.2.3.1-alpha. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity.

1 0