June 2013 - tor-commits - lists.torproject.org

[tor/master] Issue #9043 - changelog entry
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 000b4f5cbf80b5cd23b9e03a9a74a6e028321391 Author: Marek Majkowski <marek(a)popcount.org> Date: Tue Jun 11 12:17:39 2013 +0100 Issue #9043 - changelog entry --- changes/bug9043 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug9043 b/changes/bug9043 new file mode 100644 index 0000000..c3135ef --- /dev/null +++ b/changes/bug9043 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Since OpenSSL 0.9.8 we can use EVP_PKEY_cmp instead of + implementing the same thing as pkey_eq. Fixes #9043.

1 0

[tor/master] Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit fff9386af87bd0f54cda1ef4fe0bf131de7c3d8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 10:45:48 2013 -0400 Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping" This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace. --- changes/bug2077_share_delete | 7 ------- src/common/compat.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/changes/bug2077_share_delete b/changes/bug2077_share_delete deleted file mode 100644 index 71e9160..0000000 --- a/changes/bug2077_share_delete +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (windows): - - Open files to be mapped with FILE_SHARE_DELETE so that we can - replace them before closing the mapping. This is a likely cause of - warnings and crashes when replacing the microdescriptor cache - file. Diagnosed based on comments by "doorss" and by Robert - Ransom. Possible fix for bug 2077; bugfix on 0.2.2.6-alpha. - diff --git a/src/common/compat.c b/src/common/compat.c index cb1dd78..c97a454 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -248,7 +248,7 @@ tor_mmap_file(const char *filename) strlcpy(tfilename,filename,MAX_PATH); #endif file_handle = CreateFile(tfilename, - GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

1 0

[tor/master] Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / tor_tls_evp_pkey_eq
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 16d1dd134a995cf62cdbcf6c2d59da7ae09d601b Author: Marek Majkowski <marek(a)popcount.org> Date: Mon Jun 10 20:30:57 2013 +0100 Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / tor_tls_evp_pkey_eq --- src/common/tortls.c | 25 +------------------------ src/common/tortls.h | 5 ----- src/test/include.am | 1 - src/test/test.c | 2 -- src/test/test_tortls.c | 45 --------------------------------------------- 5 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index c0e3603..6bd557b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -979,29 +979,6 @@ tor_tls_cert_get_key(tor_cert_t *cert) return result; } -/** Return true iff a and b represent the same public key. */ -int -tor_tls_evp_pkey_eq(EVP_PKEY *a, EVP_PKEY *b) -{ - /* We'd like to do this, but openssl 0.9.7 doesn't have it: - return EVP_PKEY_cmp(a,b) == 1; - */ - unsigned char *a_enc = NULL, *b_enc = NULL; - int a_len, b_len, result; - a_len = i2d_PublicKey(a, &a_enc); - b_len = i2d_PublicKey(b, &b_enc); - if (a_len != b_len || a_len < 0) { - result = 0; - } else { - result = tor_memeq(a_enc, b_enc, a_len); - } - if (a_enc) - OPENSSL_free(a_enc); - if (b_enc) - OPENSSL_free(b_enc); - return result; -} - /** Return true iff the other side of tls has authenticated to us, and * the key certified in cert is the same as the key they used to do it. */ @@ -1017,7 +994,7 @@ tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_cert_t *cert) link_key = X509_get_pubkey(peercert); cert_key = X509_get_pubkey(cert->cert); - result = link_key && cert_key && tor_tls_evp_pkey_eq(cert_key, link_key); + result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1; X509_free(peercert); if (link_key) diff --git a/src/common/tortls.h b/src/common/tortls.h index c71ed57..49c488b 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -138,10 +138,5 @@ int tor_tls_cert_is_valid(int severity, int check_rsa_1024); const char *tor_tls_get_ciphersuite_name(tor_tls_t *tls); -#ifdef TORTLS_PRIVATE -/* Prototypes for private functions only used by the unit tests. */ -int tor_tls_evp_pkey_eq(EVP_PKEY *a, EVP_PKEY *b); -#endif - #endif diff --git a/src/test/include.am b/src/test/include.am index af95d44..112d1a7 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -23,7 +23,6 @@ src_test_test_SOURCES = \ src/test/test_microdesc.c \ src/test/test_pt.c \ src/test/test_replay.c \ - src/test/test_tortls.c \ src/test/test_util.c \ src/test/test_config.c \ src/ext/tinytest.c diff --git a/src/test/test.c b/src/test/test.c index da5b4e5..a9cf899 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -2133,7 +2133,6 @@ extern struct testcase_t config_tests[]; extern struct testcase_t introduce_tests[]; extern struct testcase_t replaycache_tests[]; extern struct testcase_t cell_format_tests[]; -extern struct testcase_t tortls_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -2148,7 +2147,6 @@ static struct testgroup_t testgroups[] = { { "pt/", pt_tests }, { "config/", config_tests }, { "replaycache/", replaycache_tests }, - { "tortls/", tortls_tests }, { "introduce/", introduce_tests }, END_OF_GROUPS }; diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c deleted file mode 100644 index 5409ced..0000000 --- a/src/test/test_tortls.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2013-2013, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -#include <openssl/evp.h> - -#include "orconfig.h" -#define CRYPTO_PRIVATE -#define TORTLS_PRIVATE -#include "or.h" -#include "test.h" - -static void -test_tortls_evp_pkey_eq(void) -{ - crypto_pk_t *pk1 = NULL, *pk2 = NULL; - EVP_PKEY *evp1 = NULL, *evp2 = NULL; - - pk1 = pk_generate(0); - pk2 = pk_generate(1); - test_assert(pk1 && pk2); - - evp1 = crypto_pk_get_evp_pkey_(pk1, 0); - evp2 = crypto_pk_get_evp_pkey_(pk2, 0); - test_assert(evp1 && evp2); - - test_assert(tor_tls_evp_pkey_eq(evp1, evp2) == 0); - test_assert(tor_tls_evp_pkey_eq(evp1, evp1) == 1); - - done: - crypto_pk_free(pk1); - crypto_pk_free(pk2); - if (evp1) - EVP_PKEY_free(evp1); - if (evp2) - EVP_PKEY_free(evp2); -} - -#define TORTLS_LEGACY(name) \ - { #name, legacy_test_helper, 0, &legacy_setup, test_tortls_ ## name } - -struct testcase_t tortls_tests[] = { - TORTLS_LEGACY(evp_pkey_eq), - END_OF_TESTCASES -}; -

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 616fd790ecacf933e6a624a14a8971d9ebf70d5c Merge: a64d062 fff9386 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 13:01:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug2077_share_delete | 7 ------- src/common/compat.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 12 Jun '13

12 Jun '13

commit 84305bede692cde03d12b5012e1ea9c719cd2fd4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 12 16:45:12 2013 +0000 Update translations for orbot --- values-sl/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/values-sl/strings.xml b/values-sl/strings.xml index ccb3084..99c8aa7 100644 --- a/values-sl/strings.xml +++ b/values-sl/strings.xml @@ -1,9 +1,16 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> + <string name="app_name">Orbot</string> <string name="menu_settings">Nastavitve</string> <string name="menu_info">Pomoč</string> + <string name="menu_start">Začni</string> + <string name="menu_stop">Ustavi</string> + <string name="menu_about">O programu</string> + <string name="menu_wizard">Čarovnik</string> <string name="button_help">Pomoč</string> <string name="button_close">Zapri</string> + <string name="menu_exit">Izhod</string> + <string name="press_to_start">- dolg pritisk za začetek -</string> <string name="btn_back">Nazaj</string> <string name="btn_cancel">Prekini</string>

1 0

[tor/maint-0.2.4] Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit fff9386af87bd0f54cda1ef4fe0bf131de7c3d8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 10:45:48 2013 -0400 Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping" This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace. --- changes/bug2077_share_delete | 7 ------- src/common/compat.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/changes/bug2077_share_delete b/changes/bug2077_share_delete deleted file mode 100644 index 71e9160..0000000 --- a/changes/bug2077_share_delete +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (windows): - - Open files to be mapped with FILE_SHARE_DELETE so that we can - replace them before closing the mapping. This is a likely cause of - warnings and crashes when replacing the microdescriptor cache - file. Diagnosed based on comments by "doorss" and by Robert - Ransom. Possible fix for bug 2077; bugfix on 0.2.2.6-alpha. - diff --git a/src/common/compat.c b/src/common/compat.c index cb1dd78..c97a454 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -248,7 +248,7 @@ tor_mmap_file(const char *filename) strlcpy(tfilename,filename,MAX_PATH); #endif file_handle = CreateFile(tfilename, - GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

1 0

[tor/master] Use the FILE_SHARE_DELETE flag for CreateFile on a mapping
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 09:53:46 2013 -0400 Use the FILE_SHARE_DELETE flag for CreateFile on a mapping A comment by rransom on #8795 taken together with a comment by doorss recorded on #2077 suggest that *every* attempt to replace the md cache will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag passed to CreateFile, and if we try to replace the file ourselves before unmapping it. I'm adding the FILE_SHARE_DELETE, since that's this simplest fix. Broken indexers (the favored #2077 hypothesis) could still cause trouble here, but at least this patch should make us stop stepping on our own feet. Likely fix for #2077 and its numerous duplicates. Bugfix on 0.2.2.6-alpha, which first had a microdescriptor cache that would get replaced before remapping it. --- changes/bug2077_share_delete | 7 +++++++ src/common/compat.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug2077_share_delete b/changes/bug2077_share_delete new file mode 100644 index 0000000..71e9160 --- /dev/null +++ b/changes/bug2077_share_delete @@ -0,0 +1,7 @@ + o Major bugfixes (windows): + - Open files to be mapped with FILE_SHARE_DELETE so that we can + replace them before closing the mapping. This is a likely cause of + warnings and crashes when replacing the microdescriptor cache + file. Diagnosed based on comments by "doorss" and by Robert + Ransom. Possible fix for bug 2077; bugfix on 0.2.2.6-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index 59e3898..7f7405f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -238,7 +238,7 @@ tor_mmap_file(const char *filename) strlcpy(tfilename,filename,MAX_PATH); #endif file_handle = CreateFile(tfilename, - GENERIC_READ, FILE_SHARE_READ, + GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

1 0

[tor/master] Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 3bdc4e5feee7059344f61d8d7362c77fafc5c8a8 Merge: 4f4fc63 884a0e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 10:00:33 2013 -0400 Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4 changes/bug2077_share_delete | 7 +++++++ src/common/compat.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Expand microdesc cache tests
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit 4f4fc63fea0589a4fa03f3859dc27860cdde75af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 09:30:09 2013 -0400 Expand microdesc cache tests Is it possible that *every* attempt to replace the microdesc cache on windows 7 is going to fail because of our lack of FILE_SHARE_DELETE while opening the file? If so, this test will catch #2077 and let us know when it's fixed. --- src/test/test_microdesc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 4bc9fa7..a8171a3 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -208,11 +208,25 @@ test_md_cache(void *data) md3 = NULL; /* it's history now! */ /* rebuild again, make sure it stays gone. */ - microdesc_cache_rebuild(mc, 1); + tt_int_op(microdesc_cache_rebuild(mc, 1), ==, 0); tt_ptr_op(md1, ==, microdesc_cache_lookup_by_digest256(mc, d1)); tt_ptr_op(md2, ==, microdesc_cache_lookup_by_digest256(mc, d2)); tt_ptr_op(NULL, ==, microdesc_cache_lookup_by_digest256(mc, d3)); + /* Re-add md3, and make sure we can rebuild the cache. */ + added = microdescs_add_to_cache(mc, test_md3_noannotation, NULL, + SAVED_NOWHERE, 0, time3, NULL); + tt_int_op(1, ==, smartlist_len(added)); + md3 = smartlist_get(added, 0); + smartlist_free(added); + added = NULL; + tt_int_op(md1->saved_location, ==, SAVED_IN_CACHE); + tt_int_op(md2->saved_location, ==, SAVED_IN_CACHE); + tt_int_op(md3->saved_location, ==, SAVED_IN_JOURNAL); + + tt_int_op(microdesc_cache_rebuild(mc, 1), ==, 0); + tt_int_op(md3->saved_location, ==, SAVED_IN_CACHE); + done: if (options) tor_free(options->DataDirectory);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 12 Jun '13

12 Jun '13

commit a64d062c958eed643e3bb0802269af12f9eabcb7 Merge: 8c88c75 3bdc4e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 10:01:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug2077_share_delete | 7 +++++++ src/common/compat.c | 2 +- src/test/test_microdesc.c | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-)

1 0