December 2015 - tor-commits - lists.torproject.org

[webwml/master] the RFF donate option, unlike the others, does not get money to us
by arma＠torproject.org 02 Dec '15

02 Dec '15

commit 246395d69d1ce8d0499a975dac71d88bab37a393 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 1 19:26:10 2015 -0500 the RFF donate option, unlike the others, does not get money to us hopefully this is now clearer on the page --- donate/en/donate-options.wml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 99f9a2b..942bf21 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -160,8 +160,9 @@ exchange money quickly, safely, at a lower cost.</p> <p>For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> - donations for - Europeans. They will issue a donation receipt <a + donations for Europeans. (They don't actually pass the money + through to us, but rather we trust them to spend it in Tor's + interest.) They will issue a donation receipt <a href="https://renewablefreedom.org/contact/">upon request</a>. The account information is as follows:</p>

1 0

[webwml/master] add links for RFF option
by arma＠torproject.org 02 Dec '15

02 Dec '15

commit aa8e23fd2fd157fd4b3384b6e5e1a8c88c0c098b Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 1 19:23:49 2015 -0500 add links for RFF option --- donate/en/donate-options.wml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 00331cd..99f9a2b 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -158,9 +158,12 @@ exchange money quickly, safely, at a lower cost.</p> <div class=""> <h3 style="margin-top:20px;">Donate via European Bank Transfer</h3> <p>For European bank transfers, we have an arrangement with - the Renewable Freedom Foundation to provide tax-deductible donations for - Europeans. They will issue a donation receipt upon request. The -account information is as follows:</p> + the Renewable Freedom Foundation to provide +<a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> + donations for + Europeans. They will issue a donation receipt <a + href="https://renewablefreedom.org/contact/">upon request</a>. The + account information is as follows:</p> <p>Renewable Freedom Foundation<br> IBAN: DE17721500000053693701<br> @@ -191,3 +194,4 @@ account information is as follows:</p> </div> </div> #include <donatefoot.wmi> +

1 0

[webwml/master] add a new redirect from donate-roger to donate
by arma＠torproject.org 01 Dec '15

01 Dec '15

commit 13df8c1d7fccd7ca02bdacb49b2ed374666de716 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 1 17:27:55 2015 -0500 add a new redirect from donate-roger to donate --- .htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index 83a4453..b91115f 100644 --- a/.htaccess +++ b/.htaccess @@ -59,3 +59,5 @@ RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] + diff --git a/donate/en/donate-roger.wml b/donate/en/donate-roger.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/master] Add giving-tue-blog donate redirect (#17571)
by sebastian＠torproject.org 01 Dec '15

01 Dec '15

commit 44fe446d4d90dcc4b982d7b7ba9d4998abc1c75d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Dec 1 07:59:16 2015 +0100 Add giving-tue-blog donate redirect (#17571) --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index a051529..83a4453 100644 --- a/.htaccess +++ b/.htaccess @@ -58,3 +58,4 @@ RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/giving-tue-blog.wml b/donate/en/giving-tue-blog.wml new file mode 100644 index 0000000..e69de29

1 0

[tor/master] Avoid relying on malloc internals in test_rend_cache_purge.
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit 7ff18cc1b64e4a119ec3b46102c897f3ca7107f8 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Dec 1 10:50:14 2015 +1100 Avoid relying on malloc internals in test_rend_cache_purge. Closes ticket 17724. Bug fix on ade5005853c1 and 5e9f2384cf0f, not in any released version of Tor. Patch by "teor". --- changes/bug17724 | 4 ++++ src/test/test_rendcache.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug17724 b/changes/bug17724 new file mode 100644 index 0000000..7ace99e --- /dev/null +++ b/changes/bug17724 @@ -0,0 +1,4 @@ + o Minor bug fixes (unit tests, hidden services): + - Avoid relying on malloc internals in test_rend_cache_purge. + Closes ticket 17724. Bug fix on ade5005853c1 and 5e9f2384cf0f, + not in any released version of Tor. Patch by "teor". diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 11f1114..92adf01 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1024,24 +1024,22 @@ test_rend_cache_entry_free(void *data) static void test_rend_cache_purge(void *data) { - strmap_t *our_rend_cache; - (void)data; // Deals with a NULL rend_cache rend_cache_purge(); tt_assert(rend_cache); - tt_int_op(strmap_size(rend_cache), OP_EQ, 0); + tt_assert(strmap_size(rend_cache) == 0); // Deals with existing rend_cache rend_cache_free_all(); rend_cache_init(); + tt_assert(rend_cache); + tt_assert(strmap_size(rend_cache) == 0); - our_rend_cache = rend_cache; rend_cache_purge(); tt_assert(rend_cache); tt_assert(strmap_size(rend_cache) == 0); - tt_assert(rend_cache == our_rend_cache); done: rend_cache_free_all();

1 0

[tor/master] Fix undefined behavior caused by memory overlap
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit be0891667e12a223ebda02dac2ba4a855bef4e52 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jul 17 11:53:12 2015 +0200 Fix undefined behavior caused by memory overlap The tor_cert_get_checkable_sig function uses the signing key included in the certificate (if available) when a separate public key is not given. When the signature is valid, the tor_cert_checksig function copies the public key from the checkable structure to the public key field of the certificate signing key. In situations where the separate public key is not given but the certificate includes a signing key, the source and destination pointers in the copy operation are equal and invoke undefined behavior. Undefined behaviour is avoided by ensuring both pointers are different. --- src/or/torcert.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/torcert.c b/src/or/torcert.c index 596cd2b..ef5b4c0 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -206,7 +206,11 @@ tor_cert_checksig(tor_cert_t *cert, return -1; } else { cert->sig_ok = 1; - memcpy(cert->signing_key.pubkey, checkable.pubkey->pubkey, 32); + /* Only copy the checkable public key when it is different from the signing + * key of the certificate to avoid undefined behavior. */ + if (cert->signing_key.pubkey != checkable.pubkey->pubkey) { + memcpy(cert->signing_key.pubkey, checkable.pubkey->pubkey, 32); + } cert->cert_valid = 1; return 0; }

1 0

[tor/master] Add changes file for 17722
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit e408aa3b24bad2f697254d197e43c735755b962f Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Nov 29 21:07:34 2015 +0100 Add changes file for 17722 --- changes/bug17722 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17722 b/changes/bug17722 new file mode 100644 index 0000000..1b18d4a --- /dev/null +++ b/changes/bug17722 @@ -0,0 +1,3 @@ + o Minor bugfixes (code correctness) + - Fix undefined behavior in the tor_cert_checksig function. Fixes bug + 17722; bugfix on tor-0.2.7.2-alpha.

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit ee5337e90497e31c1ef18630c4f089e70bda5269 Merge: 7ff18cc e408aa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 30 22:03:00 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17722 | 3 +++ src/or/torcert.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Fix undefined behavior caused by memory overlap
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit be0891667e12a223ebda02dac2ba4a855bef4e52 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jul 17 11:53:12 2015 +0200 Fix undefined behavior caused by memory overlap The tor_cert_get_checkable_sig function uses the signing key included in the certificate (if available) when a separate public key is not given. When the signature is valid, the tor_cert_checksig function copies the public key from the checkable structure to the public key field of the certificate signing key. In situations where the separate public key is not given but the certificate includes a signing key, the source and destination pointers in the copy operation are equal and invoke undefined behavior. Undefined behaviour is avoided by ensuring both pointers are different. --- src/or/torcert.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/torcert.c b/src/or/torcert.c index 596cd2b..ef5b4c0 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -206,7 +206,11 @@ tor_cert_checksig(tor_cert_t *cert, return -1; } else { cert->sig_ok = 1; - memcpy(cert->signing_key.pubkey, checkable.pubkey->pubkey, 32); + /* Only copy the checkable public key when it is different from the signing + * key of the certificate to avoid undefined behavior. */ + if (cert->signing_key.pubkey != checkable.pubkey->pubkey) { + memcpy(cert->signing_key.pubkey, checkable.pubkey->pubkey, 32); + } cert->cert_valid = 1; return 0; }

1 0

[tor/maint-0.2.7] Add changes file for 17722
by nickm＠torproject.org 01 Dec '15

01 Dec '15

commit e408aa3b24bad2f697254d197e43c735755b962f Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Nov 29 21:07:34 2015 +0100 Add changes file for 17722 --- changes/bug17722 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17722 b/changes/bug17722 new file mode 100644 index 0000000..1b18d4a --- /dev/null +++ b/changes/bug17722 @@ -0,0 +1,3 @@ + o Minor bugfixes (code correctness) + - Fix undefined behavior in the tor_cert_checksig function. Fixes bug + 17722; bugfix on tor-0.2.7.2-alpha.

1 0