- tor-commits - lists.torproject.org

[tor/master] changes file for bug4650
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit ff282a11266601bf2690d34a4a74622192b9bbfa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 15:12:02 2012 -0500 changes file for bug4650 --- changes/bug4650 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4650 b/changes/bug4650 new file mode 100644 index 0000000..44161f8 --- /dev/null +++ b/changes/bug4650 @@ -0,0 +1,7 @@ + o Minor features: + - Log more useful messages when we fail to disable debugger attachment. + + o Minor bugfixes: + - Reject attempts to disable DisableDebuggerAttachment while Tor is + running. Fixes bug 4650; bugfix on 0.2.3.9-alpha. +

1 0

[tor/master] Merge remote-tracking branch 'public/bug4650_nm_squashed'
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 5e9d349979f550474ba105491ba463a8b69a88ae Merge: 73d4dbe ff282a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 17:59:49 2012 -0500 Merge remote-tracking branch 'public/bug4650_nm_squashed' changes/bug4650 | 7 +++++++ doc/tor.1.txt | 4 ++-- src/common/compat.c | 9 +++++---- src/or/config.c | 33 +++++++++++++++++++++++++++------ 4 files changed, 41 insertions(+), 12 deletions(-)

1 0

[tor/master] whitespace and warning fixes for bug4746
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 73d4dbe103db639cf806e1610a79e4a781428d1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 16:53:37 2012 -0500 whitespace and warning fixes for bug4746 --- src/common/crypto.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index b1fc5ed..e377b01 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1839,8 +1839,9 @@ crypto_store_dynamic_dh_modulus(const char *fname) char *base64_encoded_dh = NULL; char *file_string = NULL; int retval = -1; - const static char *file_header = "# This file contains stored Diffie-Hellman" - " parameters for future use.\n# You *do not* need to edit this file.\n\n"; + static const char file_header[] = "# This file contains stored Diffie-" + "Hellman parameters for future use.\n# You *do not* need to edit this " + "file.\n\n"; tor_assert(fname); @@ -1880,10 +1881,10 @@ crypto_store_dynamic_dh_modulus(const char *fname) } /* concatenate file header and the dh parameters blob */ - tor_asprintf(&file_string, "%s%s", file_header, base64_encoded_dh); + new_len = tor_asprintf(&file_string, "%s%s", file_header, base64_encoded_dh); /* write to file */ - if (write_bytes_to_new_file(fname, file_string, strlen(file_string), 0) < 0) { + if (write_bytes_to_new_file(fname, file_string, new_len, 0) < 0) { log_info(LD_CRYPTO, "'%s' was already occupied.", fname); goto done; }

1 0

[tor/master] Add an informative header on the 'keys/dynamic_dh_params' file.
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit d05bc02192b571e57c1568af45165dd7847a2f91 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 19 16:06:22 2011 +0100 Add an informative header on the 'keys/dynamic_dh_params' file. --- src/common/crypto.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 673fc0c..63e4f26 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1833,7 +1833,10 @@ crypto_store_dynamic_dh_modulus(const char *fname) DH *dh = NULL; unsigned char *dh_string_repr = NULL, *cp = NULL; char *base64_encoded_dh = NULL; + char *file_string = NULL; int retval = -1; + const static char *file_header = "# This file contains stored Diffie-Hellman" + " parameters for future use.\n# You *do not* need to edit this file.\n\n"; tor_assert(fname); @@ -1872,7 +1875,11 @@ crypto_store_dynamic_dh_modulus(const char *fname) goto done; } - if (write_bytes_to_new_file(fname, base64_encoded_dh, new_len, 0) < 0) { + /* concatenate file header and the dh parameters blob */ + tor_asprintf(&file_string, "%s%s", file_header, base64_encoded_dh); + + /* write to file */ + if (write_bytes_to_new_file(fname, file_string, strlen(file_string), 0) < 0) { log_info(LD_CRYPTO, "'%s' was already occupied.", fname); goto done; } @@ -1884,6 +1891,7 @@ crypto_store_dynamic_dh_modulus(const char *fname) DH_free(dh); tor_free(dh_string_repr); tor_free(base64_encoded_dh); + tor_free(file_string); return retval; } @@ -1895,6 +1903,7 @@ crypto_get_stored_dynamic_dh_modulus(const char *fname) { int retval; char *contents = NULL; + const char *contents_tmp = NULL; int dh_codes; char *fname_new = NULL; DH *stored_dh = NULL; @@ -1911,15 +1920,23 @@ crypto_get_stored_dynamic_dh_modulus(const char *fname) goto done; /*usually means that ENOENT. don't try to move file to broken.*/ } + /* skip the file header */ + contents_tmp = eat_whitespace(contents); + if (!*contents_tmp) { + log_warn(LD_CRYPTO, "Stored dynamic DH modulus file " + "seems corrupted (eat_whitespace)."); + goto err; + } + /* 'fname' contains the DH parameters stored in base64-ed DER * format. We are only interested in the DH modulus. * NOTE: We allocate more storage here than we need. Since we're already * doing that, we can also add 1 byte extra to appease Coverity's * scanner. */ - cp = base64_decoded_dh = tor_malloc_zero(strlen(contents) + 1); - length = base64_decode((char *)base64_decoded_dh, strlen(contents), - contents, strlen(contents)); + cp = base64_decoded_dh = tor_malloc_zero(strlen(contents_tmp) + 1); + length = base64_decode((char *)base64_decoded_dh, strlen(contents_tmp), + contents_tmp, strlen(contents_tmp)); if (length < 0) { log_warn(LD_CRYPTO, "Stored dynamic DH modulus seems corrupted (base64)."); goto err;

1 0

[tor/master] Report cookie file location as absolute in protocolinfo message
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 4e14ce4dba168ad4564fa15d4e86b4f4e9d36655 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 13:20:48 2012 -0500 Report cookie file location as absolute in protocolinfo message --- src/or/control.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index c9d3765..3ba7bfe 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2944,8 +2944,11 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, const or_options_t *options = get_options(); int cookies = options->CookieAuthentication; char *cfile = get_cookie_file(); - char *esc_cfile = esc_for_log(cfile); + char *abs_cfile; + char *esc_cfile; char *methods; + abs_cfile = make_path_absolute(cfile); + esc_cfile = esc_for_log(abs_cfile); { int passwd = (options->HashedControlPassword != NULL || options->HashedControlSessionPassword != NULL); @@ -2971,6 +2974,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, escaped(VERSION)); tor_free(methods); tor_free(cfile); + tor_free(abs_cfile); tor_free(esc_cfile); } done:

1 0

[tor/master] Merge remote-tracking branch 'asn-mytor/bug4746'
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 7fbf1e225e81171e72fdd31a538b55da16b97ab7 Merge: 8d74fba d05bc02 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 16:44:03 2012 -0500 Merge remote-tracking branch 'asn-mytor/bug4746' src/common/crypto.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-)

1 0

[tor/master] changes file for bug4746
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit eefe8857c2dfa8524310bf8c1eb89464b4e38dfa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 16:53:27 2012 -0500 changes file for bug4746 --- changes/bug4746 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4746 b/changes/bug4746 new file mode 100644 index 0000000..60fbef4 --- /dev/null +++ b/changes/bug4746 @@ -0,0 +1,2 @@ + o Minor features: + - Prepend an informative header to generated dynamic_dh_params files.

1 0

[tor/master] changes file for #4881
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 3085b76a0996d87ed32482f1023963ccbc28f4d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 14:59:49 2012 -0500 changes file for #4881 --- changes/absolute_cookie_file | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/absolute_cookie_file b/changes/absolute_cookie_file new file mode 100644 index 0000000..db9f7be --- /dev/null +++ b/changes/absolute_cookie_file @@ -0,0 +1,3 @@ + o Minor features (controller): + - When reporting the path to the cookie file to the controller, + give an absolute path. Resolves ticket 4881.

1 0

[tor/master] Merge branch 'absolute_cookie_file'
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 8d74fba651dfb788568d2236da773ed9fd9b4a39 Merge: dca3c9f 3085b76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 15:00:02 2012 -0500 Merge branch 'absolute_cookie_file' changes/absolute_cookie_file | 3 +++ src/or/control.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 10 Jan '12

10 Jan '12

commit 860e1221497a7ea3ffbd033965ccc8daddab3ee3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 10 20:45:04 2012 +0000 Update translations for tsum --- pl/tsum.po | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pl/tsum.po b/pl/tsum.po index a6cefd2..fb4ceae 100644 --- a/pl/tsum.po +++ b/pl/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-10 20:06+0000\n" +"PO-Revision-Date: 2012-01-10 20:31+0000\n" "Last-Translator: jan kowalski <janfkowalski(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #. type: Plain text #: en/tsum.text:2 msgid "# The Short User Manual\n" -msgstr "" +msgstr "# The Short User Manual\n" #. type: Plain text #: en/tsum.text:7 @@ -224,7 +224,7 @@ msgstr "" msgid "" "Before you can verify the signature, you will have to download and\n" "install GnuPG: \n" -msgstr "" +msgstr "Przed weryfikacją podpisu, należy pobrać i zainstalować GnuPG: \n" #. type: Plain text #: en/tsum.text:109 @@ -322,6 +322,12 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" +"Jeśli podpis się zgadza oraz pojawił się komunikat *\"Good signature\"* " +"wyodrębnij pliki z archiwum pakietu. Po czym powinien być widoczny folder " +"podobny do **-tor-browser_en-US**. W środku tego folderu znajduje się inny " +"folder o nazwie **Docs**, który zawiera plik o nazwie **changelog**. Należy " +"się upewnić czy numer wersji znajdujący się na początku pliku changelog " +"pasuje do numeru wersji w nazwie pliku. " #. type: Plain text #: en/tsum.text:153 @@ -399,6 +405,9 @@ msgid "" "(ISP) is blocking Tor. Very often this can be worked around with **Tor " "bridges**, hidden relays that aren't as easy to block." msgstr "" +"Jeżeli Tor nadal nie działa, możliwe że Tor jest blokowany przez Twojego " +"dostawcę usług internetowych (ISP). Często można użyć **Tor Bridges**, " +"ukryte przekaźniki które są trudniejsze do zablokowania" #. type: Plain text #: en/tsum.text:195 @@ -569,7 +578,7 @@ msgid "" "random control password. If you do not see a Reset button, or if Vidalia\n" "is unable to restart Tor for you; go into your process or task manager,\n" "and terminate the Tor process. Then use Vidalia to restart Tor.\n" -msgstr "" +msgstr "**Vidalia się wykoleiła, ale Tor jeszcze działa**:\n" #. type: Plain text #: en/tsum.text:298

1 0