- tor-commits - lists.torproject.org

[tor/master] Improve error msg on failed getinfo fingerprint
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 2e34416c6db20156619e80975e46c8b1030bb3a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:19:52 2011 -0400 Improve error msg on failed getinfo fingerprint --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index d33d337..954da65 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1396,7 +1396,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "fingerprint")) { crypto_pk_env_t *server_key; if (!server_mode(get_options())) { - *errmsg = "No routerdesc known; am I really a server?"; + *errmsg = "Not running in server mode"; return -1; } server_key = get_server_identity_key();

1 0

[tor/master] Merge branch 'bug3577' into maint-0.2.2
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 866a2828bdcb88398ee8332e918e9a9028397156 Merge: 5580fbb 2e34416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:20:01 2011 -0400 Merge branch 'bug3577' into maint-0.2.2 changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 852b1312812bd0174353271c5a2d42ed08c6b8a2 Merge: 642cff5 866a282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:22:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/control.c changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.2] Change GETINFO fingerprint to look at server_mode, not my_descriptor
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 5000e59b5ff4234c6119c5ac0e9f419430c8b699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 13 12:44:41 2011 -0400 Change GETINFO fingerprint to look at server_mode, not my_descriptor It's possible for us to be a server and have a fingerprint without having yet generated a descriptor. Fixes bug 3577; bugfix on 0.2.0.1-alpha --- changes/bug3577 | 4 ++++ src/or/control.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug3577 b/changes/bug3577 new file mode 100644 index 0000000..6335272 --- /dev/null +++ b/changes/bug3577 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Allow GETINFO fingerprint to return a fingerprint even when + we have not yet built a router descriptor. Fixes bug 3577; + bugfix on 0.2.0.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index da0a95d..d33d337 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1394,14 +1394,14 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "dir-usage")) { *answer = directory_dump_request_log(); } else if (!strcmp(question, "fingerprint")) { - routerinfo_t *me = router_get_my_routerinfo(); - if (!me) { + crypto_pk_env_t *server_key; + if (!server_mode(get_options())) { *errmsg = "No routerdesc known; am I really a server?"; return -1; } + server_key = get_server_identity_key(); *answer = tor_malloc(HEX_DIGEST_LEN+1); - base16_encode(*answer, HEX_DIGEST_LEN+1, me->cache_info.identity_digest, - DIGEST_LEN); + crypto_pk_get_fingerprint(server_key, *answer, 0); } return 0; }

1 0

[tor/maint-0.2.2] Improve error msg on failed getinfo fingerprint
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 2e34416c6db20156619e80975e46c8b1030bb3a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:19:52 2011 -0400 Improve error msg on failed getinfo fingerprint --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index d33d337..954da65 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1396,7 +1396,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "fingerprint")) { crypto_pk_env_t *server_key; if (!server_mode(get_options())) { - *errmsg = "No routerdesc known; am I really a server?"; + *errmsg = "Not running in server mode"; return -1; } server_key = get_server_identity_key();

1 0

[tor/maint-0.2.2] Merge branch 'bug3577' into maint-0.2.2
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 866a2828bdcb88398ee8332e918e9a9028397156 Merge: 5580fbb 2e34416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:20:01 2011 -0400 Merge branch 'bug3577' into maint-0.2.2 changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Only download microdesc consensus from caches that support it
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 642cff5bcad9288aa32f27ea5309019538580438 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 14:19:18 2011 -0400 Only download microdesc consensus from caches that support it Bugfix on 0.2.3.1-alpha; found by arma; never got a bug number. --- changes/microdesc_con_dl | 3 +++ src/or/directory.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/microdesc_con_dl b/changes/microdesc_con_dl new file mode 100644 index 0000000..9bf1260 --- /dev/null +++ b/changes/microdesc_con_dl @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Only try to download a microdescriptor-flavored consensus from + a directory cache that provides those. Bugfix on 0.2.3.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index ac35d3c..2667f12 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -379,11 +379,13 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_STATUS_VOTE: case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES: + case DIR_PURPOSE_FETCH_CERTIFICATE: type = V3_DIRINFO; break; case DIR_PURPOSE_FETCH_CONSENSUS: - case DIR_PURPOSE_FETCH_CERTIFICATE: type = V3_DIRINFO; + if (resource && !strcmp(resource,"microdesc")) + type |= MICRODESC_DIRINFO; break; case DIR_PURPOSE_FETCH_MICRODESC: type = MICRODESC_DIRINFO;

1 0

r24907: {website} update windows tbbs to 1.3.26 (website/trunk/include)
by Erinn Clark 14 Jul '11

14 Jul '11

Author: erinn Date: 2011-07-14 17:39:55 +0000 (Thu, 14 Jul 2011) New Revision: 24907 Modified: website/trunk/include/versions.wmi Log: update windows tbbs to 1.3.26 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 14:37:02 UTC (rev 24906) +++ website/trunk/include/versions.wmi 2011-07-14 17:39:55 UTC (rev 24907) @@ -21,7 +21,7 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.25</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.26</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag>

1 0

[obfsproxy/master] Fix sha256.c so it actually compiles
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 3c5d4c63a0eaa67d41c552bd26160ce442c7b36e Author: Zack Weinberg <zackw(a)panix.com> Date: Fri Jul 8 21:06:12 2011 -0700 Fix sha256.c so it actually compiles --- configure.ac | 2 +- src/sha256.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 7465708..025589f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.67])dnl Possibly earlier will do, but this is what I have +AC_PREREQ([2.61])dnl Possibly earlier will do, but this is what I have AC_INIT([obsproxy], [0.0]) AC_CONFIG_SRCDIR([src/main.c]) diff --git a/src/sha256.c b/src/sha256.c index 4833b99..ff2cf21 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -7,6 +7,7 @@ #include "sha256.h" #include <assert.h> #include <string.h> +#include <arpa/inet.h> /* for htonl/ntohl */ #define STMT_BEGIN do { #define STMT_END } while (0)

1 0

[obfsproxy/master] Put back some #includes to make it compile on Windows again.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 811b7802423578aa77101a4dc2ce8d61ab78fcc7 Author: Zack Weinberg <zackw(a)panix.com> Date: Mon Jul 11 15:15:34 2011 -0700 Put back some #includes to make it compile on Windows again. --- src/network.c | 6 +++++- src/socks.c | 4 ++++ src/util.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index c6348fa..081af6e 100644 --- a/src/network.c +++ b/src/network.c @@ -19,6 +19,10 @@ #include <event2/listener.h> #include <event2/util.h> +#ifdef _WIN32 +#include <ws2tcpip.h> /* socklen_t */ +#endif + struct listener_t { struct evconnlistener *listener; protocol_params_t *proto_params; @@ -391,7 +395,7 @@ output_event_cb(struct bufferevent *bev, short what, void *arg) * socks client */ socks_state_set_address(conn->socks_state, sa); } - socks_send_reply(conn->socks_state, + socks_send_reply(conn->socks_state, bufferevent_get_output(conn->input), 0); /* we sent a socks reply. We can finally move over to being a regular input bufferevent. */ diff --git a/src/socks.c b/src/socks.c index b403be8..e6d72fd 100644 --- a/src/socks.c +++ b/src/socks.c @@ -14,6 +14,10 @@ #include <event2/buffer.h> +#ifdef _WIN32 +#include <ws2tcpip.h> /* sockaddr_in6 */ +#endif + /** General SOCKS5 idea: diff --git a/src/util.c b/src/util.c index 6f5302b..d54c67f 100644 --- a/src/util.c +++ b/src/util.c @@ -15,6 +15,10 @@ #include <event2/dns.h> #include <event2/util.h> +#ifdef _WIN32 +#include <ws2tcpip.h> /* addrinfo */ +#endif + /** Any size_t larger than this amount is likely to be an underflow. */ #define SIZE_T_CEILING (SIZE_MAX/2 - 16)

1 0