March 2012 - tor-commits - lists.torproject.org

[obfsproxy/master] Merge branch 'bug4921'
by asn＠torproject.org 19 Mar '12

19 Mar '12

commit 1415cfd325af85d4922c2a69ac395432887a3636 Merge: 0a5200e b9a3fe1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 19 12:49:24 2012 -0700 Merge branch 'bug4921' Makefile.am | 3 +- src/network.c | 22 ++--------- src/test/unittest.c | 2 + src/test/unittest_util.c | 59 +++++++++++++++++++++++++++++ src/util.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 3 + 6 files changed, 163 insertions(+), 19 deletions(-)

1 0

[obfsproxy/master] Copy-paste tor.git:src/common/compat.c:tor_asprintf() in.
by asn＠torproject.org 19 Mar '12

19 Mar '12

commit db4053efff50c7f0813cab4e7b7e11b06ead724e Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 22 10:45:27 2012 -0800 Copy-paste tor.git:src/common/compat.c:tor_asprintf() in. We also need its tor_vasprintf() dependency. --- src/util.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index b820981..1d78f1f 100644 --- a/src/util.c +++ b/src/util.c @@ -343,6 +343,100 @@ ascii_strlower(char *s) } } +/** + * Portable asprintf implementation. Does a printf() into a newly malloc'd + * string. Sets *<b>strp</b> to this string, and returns its length (not + * including the terminating NUL character). + * + * You can treat this function as if its implementation were something like + <pre> + char buf[_INFINITY_]; + tor_snprintf(buf, sizeof(buf), fmt, args); + *strp = tor_strdup(buf); + return strlen(*strp): + </pre> + * Where _INFINITY_ is an imaginary constant so big that any string can fit + * into it. + */ +int +tor_asprintf(char **strp, const char *fmt, ...) +{ + int r; + va_list args; + va_start(args, fmt); + r = tor_vasprintf(strp, fmt, args); + va_end(args); + if (!*strp || r < 0) { + log_err(LD_BUG, "Internal error in asprintf"); + tor_assert(0); + } + return r; +} + +/** + * Portable vasprintf implementation. Does a printf() into a newly malloc'd + * string. Differs from regular vasprintf in the same ways that + * tor_asprintf() differs from regular asprintf. + */ +int +tor_vasprintf(char **strp, const char *fmt, va_list args) +{ + /* use a temporary variable in case *strp is in args. */ + char *strp_tmp=NULL; +#ifdef HAVE_VASPRINTF + /* If the platform gives us one, use it. */ + int r = vasprintf(&strp_tmp, fmt, args); + if (r < 0) + *strp = NULL; + else + *strp = strp_tmp; + return r; +#elif defined(_MSC_VER) + /* On Windows, _vsnprintf won't tell us the length of the string if it + * overflows, so we need to use _vcsprintf to tell how much to allocate */ + int len, r; + char *res; + len = _vscprintf(fmt, args); + if (len < 0) { + *strp = NULL; + return -1; + } + strp_tmp = tor_malloc(len + 1); + r = _vsnprintf(strp_tmp, len+1, fmt, args); + if (r != len) { + tor_free(strp_tmp); + *strp = NULL; + return -1; + } + *strp = strp_tmp; + return len; +#else + /* Everywhere else, we have a decent vsnprintf that tells us how many + * characters we need. We give it a try on a short buffer first, since + * it might be nice to avoid the second vsnprintf call. + */ + char buf[128]; + int len, r; + va_list tmp_args; + va_copy(tmp_args, args); + len = vsnprintf(buf, sizeof(buf), fmt, tmp_args); + va_end(tmp_args); + if (len < (int)sizeof(buf)) { + *strp = tor_strdup(buf); + return len; + } + strp_tmp = tor_malloc(len+1); + r = vsnprintf(strp_tmp, len+1, fmt, args); + if (r != len) { + tor_free(strp_tmp); + *strp = NULL; + return -1; + } + *strp = strp_tmp; + return len; +#endif +} + /************************ Logging Subsystem *************************/ /** The code of this section was to a great extent shamelessly copied off tor. It's basicaly a stripped down version of tor's logging

1 0

[obfsproxy/master] Change an instance of 'malloc(); snprintf(); ' to use 'obfs_asprintf()'.
by asn＠torproject.org 19 Mar '12

19 Mar '12

commit b9a3fe1012815d7040cbd766fa463c2599338bc7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 22 12:51:13 2012 -0800 Change an instance of 'malloc();snprintf();' to use 'obfs_asprintf()'. --- src/network.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/network.c b/src/network.c index d001c1f..968bdf4 100644 --- a/src/network.c +++ b/src/network.c @@ -591,24 +591,10 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) /* associate bufferevent with the new connection. */ newconn->buffer = buf; - { /* set up temporary FQDN peername. When we connect to the host, we - will replace this peername with the IP address we connected - to. */ - - /* '6' is strlen(":65535") - '1' is the ending NUL. */ - const size_t peername_len = strlen(addr) + 6 + 1; - newconn->peername = xzalloc(peername_len); - if (obfs_snprintf(newconn->peername, peername_len, "%s:%d", - addr, port) < 0) { - log_warn("Failed while writing peername (%s:%u)! This might be a bug.", - addr, port); - free(newconn->peername); - newconn->peername = NULL; - conn_free(newconn); - return NULL; - } - } + /* Set up a temporary FQDN peername. When we actually connect to the + host, we will replace this peername with the IP address we + connected to. */ + obfs_asprintf(&newconn->peername, "%s:%u", addr, port); bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); if (bufferevent_socket_connect_hostname(buf, get_evdns_base(),

1 0

[torbrowser/maint-2.2] bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 7a82857f76ddab3e1521c4b067180d393054857c Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 14:31:02 2012 -0300 bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions --- build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index cb40d2a..a55f798 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ "2.2.35-8-MacOS-i386", -"2.2.35-7.1-MacOS-x86_64", +"2.2.35-8-MacOS-x86_64", "2.2.35-8-Windows", -"2.2.35-8-Linux-i686", -"2.2.35-8-Linux-x86_64", +"2.2.35-9-Linux-i686", +"2.2.35-9-Linux-x86_64", "2.3.12-alpha-1-MacOS-i386", "2.3.12-alpha-1-Windows", "2.3.12-alpha-1-Linux-i386",

1 0

[torbrowser/maint-2.3] bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 7a82857f76ddab3e1521c4b067180d393054857c Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 14:31:02 2012 -0300 bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions --- build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index cb40d2a..a55f798 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ "2.2.35-8-MacOS-i386", -"2.2.35-7.1-MacOS-x86_64", +"2.2.35-8-MacOS-x86_64", "2.2.35-8-Windows", -"2.2.35-8-Linux-i686", -"2.2.35-8-Linux-x86_64", +"2.2.35-9-Linux-i686", +"2.2.35-9-Linux-x86_64", "2.3.12-alpha-1-MacOS-i386", "2.3.12-alpha-1-Windows", "2.3.12-alpha-1-Linux-i386",

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 38a0675ba1225cebe9274d7d2faf881209d6ac4a Merge: bb7ecfb 7a82857 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 14:31:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 7a82857f76ddab3e1521c4b067180d393054857c Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 14:31:02 2012 -0300 bump linux tbbs to 2.2.35-9 and osx 64-bit to 2.2.35-8 in recommended-versions --- build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index cb40d2a..a55f798 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ "2.2.35-8-MacOS-i386", -"2.2.35-7.1-MacOS-x86_64", +"2.2.35-8-MacOS-x86_64", "2.2.35-8-Windows", -"2.2.35-8-Linux-i686", -"2.2.35-8-Linux-x86_64", +"2.2.35-9-Linux-i686", +"2.2.35-9-Linux-x86_64", "2.3.12-alpha-1-MacOS-i386", "2.3.12-alpha-1-Windows", "2.3.12-alpha-1-Linux-i386",

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 38a0675ba1225cebe9274d7d2faf881209d6ac4a Merge: bb7ecfb 7a82857 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 14:31:26 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

r25556: {website} bump linux tbbs to 2.2.35-9 to fix the vidalia debug log bug (website/trunk/include)
by Erinn Clark 19 Mar '12

19 Mar '12

Author: erinn Date: 2012-03-19 17:30:26 +0000 (Mon, 19 Mar 2012) New Revision: 25556 Modified: website/trunk/include/versions.wmi Log: bump linux tbbs to 2.2.35-9 to fix the vidalia debug log bug Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-03-19 03:52:45 UTC (rev 25555) +++ website/trunk/include/versions.wmi 2012-03-19 17:30:26 UTC (rev 25556) @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-8</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-8</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-9</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-9</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0h</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>11.0</define-tag>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 19 Mar '12

19 Mar '12

commit 9902af29e63356a6834d5d366deee217c6f745e5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 19 17:15:07 2012 +0000 Update translations for orbot --- values-eu/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-eu/strings.xml b/values-eu/strings.xml index fcf6df2..01c3dfc 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -129,7 +129,7 @@ <string name="pref_use_whispercore">Use WhisperCore</string> <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> <string name="pref_proxy_type_title">Proxy mota</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string> <string name="pref_proxy_host_title">Proxy Ostalaria</string> <string name="pref_proxy_host_summary">Proxy zerbitzari ostalaria</string> @@ -155,7 +155,7 @@ <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> <string name="exit_nodes">Irteera Nodoak</string> <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="enter_exit_nodes">Irteera Nodoak sartu</string> <string name="exclude_nodes">Exclude Nodes</string> <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> <string name="enter_exclude_nodes">Enter Exclude Nodes</string> @@ -171,7 +171,7 @@ <string name="relays">Erreleak</string> <string name="relaying">Erreleatzea</string> <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> + <string name="relay_port">Errele Portua</string> <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> <string name="enter_or_port">Sartu OR portua</string> <string name="relay_nickname">Errele ezizena</string> @@ -181,11 +181,11 @@ <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> - <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> + <string name="enter_ports">Portuak sartu</string> + <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string> <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> - <string name="hidden_service_ports">Hidden Service Ports</string> + <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> <string name="project_home">Project Home(s): </string>

1 0