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

[tor/master] Remove a few more unused functions.
by nickm＠torproject.org 02 Mar '13

02 Mar '13

commit 289653c3921e2153ff0450d3f6b0fdf4e075d6ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 21:57:52 2013 -0500 Remove a few more unused functions. --- src/or/router.c | 17 -------------- src/or/router.h | 2 - src/or/routerlist.c | 62 --------------------------------------------------- src/or/routerlist.h | 2 - 4 files changed, 0 insertions(+), 83 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 95aa70a..0c3b671 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2966,23 +2966,6 @@ router_get_verbose_nickname(char *buf, const routerinfo_t *router) strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1); } -/** Set buf (which must have MAX_VERBOSE_NICKNAME_LEN+1 bytes) to the - * verbose representation of the identity of router. The format is: - * A dollar sign. - * The upper-case hexadecimal encoding of the SHA1 hash of router's identity. - * A "=" if the router is named; a "~" if it is not. - * The router's nickname. - **/ -void -routerstatus_get_verbose_nickname(char *buf, const routerstatus_t *router) -{ - buf[0] = '$'; - base16_encode(buf+1, HEX_DIGEST_LEN+1, router->identity_digest, - DIGEST_LEN); - buf[1+HEX_DIGEST_LEN] = router->is_named ? '=' : '~'; - strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1); -} - /** Forget that we have issued any router-related warnings, so that we'll * warn again if we see the same errors. */ void diff --git a/src/or/router.h b/src/or/router.h index fd2076a..96749b5 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -132,8 +132,6 @@ const char *routerstatus_describe(const routerstatus_t *ri); const char *extend_info_describe(const extend_info_t *ei); void router_get_verbose_nickname(char *buf, const routerinfo_t *router); -void routerstatus_get_verbose_nickname(char *buf, - const routerstatus_t *router); void router_reset_warnings(void); void router_reset_reachability(void); void router_free_all(void); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2f08167..f98ba64 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -54,8 +54,6 @@ static const routerstatus_t *router_pick_dirserver_generic( smartlist_t *sourcelist, dirinfo_type_t type, int flags); static void mark_all_dirservers_up(smartlist_t *server_list); -static int router_nickname_matches(const routerinfo_t *router, - const char *nickname); static void dir_server_free(dir_server_t *ds); static int signed_desc_digest_is_recognized(signed_descriptor_t *desc); static const char *signed_descriptor_get_body_impl( @@ -1462,30 +1460,6 @@ routerlist_add_node_and_family(smartlist_t *sl, const routerinfo_t *router) nodelist_add_node_and_family(sl, node); } -/** Return 1 iff any member of the (possibly NULL) comma-separated list - * list is an acceptable nickname or hexdigest for router. Else - * return 0. - */ -int -router_nickname_is_in_list(const routerinfo_t *router, const char *list) -{ - smartlist_t *nickname_list; - int v = 0; - - if (!list) - return 0; /* definitely not */ - tor_assert(router); - - nickname_list = smartlist_new(); - smartlist_split_string(nickname_list, list, ",", - SPLIT_SKIP_SPACE|SPLIT_STRIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH(nickname_list, const char *, cp, - if (router_nickname_matches(router, cp)) {v=1;break;}); - SMARTLIST_FOREACH(nickname_list, char *, cp, tor_free(cp)); - smartlist_free(nickname_list); - return v; -} - /** Add every suitable node from our nodelist to sl, so that * we can pick a node for a circuit. */ @@ -2299,31 +2273,6 @@ router_is_named(const routerinfo_t *router) tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN)); } -/** Return true iff the digest of router's identity key, - * encoded in hexadecimal, matches hexdigest (which is - * optionally prefixed with a single dollar sign). Return false if - * hexdigest is malformed, or it doesn't match. */ -static INLINE int -router_hex_digest_matches(const routerinfo_t *router, const char *hexdigest) -{ - return hex_digest_nickname_matches(hexdigest, - router->cache_info.identity_digest, - router->nickname, - router_is_named(router)); -} - -/** Return true if router's nickname matches nickname - * (case-insensitive), or if router's identity key digest - * matches a hexadecimal value stored in nickname. Return - * false otherwise. */ -static int -router_nickname_matches(const routerinfo_t *router, const char *nickname) -{ - if (nickname[0]!='$' && !strcasecmp(router->nickname, nickname)) - return 1; - return router_hex_digest_matches(router, nickname); -} - /** Return true iff digest is the digest of the identity key of a * trusted directory matching at least one bit of type. If type * is zero, any authority is okay. */ @@ -4052,17 +4001,6 @@ clear_dir_servers(void) router_dir_info_changed(); } -/** Return 1 if any trusted dir server supports v1 directories, - * else return 0. */ -int -any_trusted_dir_is_v1_authority(void) -{ - if (trusted_dir_servers) - return get_n_authorities(V1_DIRINFO) > 0; - - return 0; -} - /** For every current directory connection whose purpose is purpose, * and where the resource being downloaded begins with prefix, split * rest of the resource into base16 fingerprints (or base64 fingerprints if diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 1849fff..28b2f58 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -42,7 +42,6 @@ int router_get_my_share_of_directory_requests(double *v2_share_out, double *v3_share_out); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); -int router_nickname_is_in_list(const routerinfo_t *router, const char *list); const routerinfo_t *routerlist_find_my_routerinfo(void); uint32_t router_get_advertised_bandwidth(const routerinfo_t *router); uint32_t router_get_advertised_bandwidth_capped(const routerinfo_t *router); @@ -146,7 +145,6 @@ void dir_server_add(dir_server_t *ent); void authority_cert_free(authority_cert_t *cert); void clear_dir_servers(void); -int any_trusted_dir_is_v1_authority(void); void update_consensus_router_descriptor_downloads(time_t now, int is_vote, networkstatus_t *consensus); void update_router_descriptor_downloads(time_t now);

1 0

[tor/master] Remove unused HMAC-SHA1 function
by nickm＠torproject.org 02 Mar '13

02 Mar '13

commit a05dc378e391b868a694914bd763d057930f076a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 21:59:12 2013 -0500 Remove unused HMAC-SHA1 function (We're not adding any new SHA1 instances in our protocols, so this should never actually be needed.) --- src/common/crypto.c | 15 --------------- src/common/crypto.h | 3 --- src/test/test_crypto.c | 28 ---------------------------- 3 files changed, 0 insertions(+), 46 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7..8d37400 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1631,21 +1631,6 @@ crypto_digest_assign(crypto_digest_t *into, memcpy(into,from,sizeof(crypto_digest_t)); } -/** Compute the HMAC-SHA-1 of the msg_len bytes in msg, using - * the key of length key_len. Store the DIGEST_LEN-byte result - * in hmac_out. - */ -void -crypto_hmac_sha1(char *hmac_out, - const char *key, size_t key_len, - const char *msg, size_t msg_len) -{ - tor_assert(key_len < INT_MAX); - tor_assert(msg_len < INT_MAX); - HMAC(EVP_sha1(), key, (int)key_len, (unsigned char*)msg, (int)msg_len, - (unsigned char*)hmac_out, NULL); -} - /** Compute the HMAC-SHA-256 of the msg_len bytes in msg, using * the key of length key_len. Store the DIGEST256_LEN-byte * result in hmac_out. diff --git a/src/common/crypto.h b/src/common/crypto.h index 12fcfae..1976549 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -218,9 +218,6 @@ void crypto_digest_get_digest(crypto_digest_t *digest, crypto_digest_t *crypto_digest_dup(const crypto_digest_t *digest); void crypto_digest_assign(crypto_digest_t *into, const crypto_digest_t *from); -void crypto_hmac_sha1(char *hmac_out, - const char *key, size_t key_len, - const char *msg, size_t msg_len); void crypto_hmac_sha256(char *hmac_out, const char *key, size_t key_len, const char *msg, size_t msg_len); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index afb338a..1f12c87 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -269,34 +269,6 @@ test_crypto_sha(void) "96177A9CB410FF61F20015AD"); tt_int_op(i, ==, 0); - /* Test HMAC-SHA-1 with test cases from RFC2202. */ - - /* Case 1. */ - memset(key, 0x0b, 20); - crypto_hmac_sha1(digest, key, 20, "Hi There", 8); - test_streq(hex_str(digest, 20), - "B617318655057264E28BC0B6FB378C8EF146BE00"); - /* Case 2. */ - crypto_hmac_sha1(digest, "Jefe", 4, "what do ya want for nothing?", 28); - test_streq(hex_str(digest, 20), - "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79"); - - /* Case 4. */ - base16_decode(key, 25, - "0102030405060708090a0b0c0d0e0f10111213141516171819", 50); - memset(data, 0xcd, 50); - crypto_hmac_sha1(digest, key, 25, data, 50); - test_streq(hex_str(digest, 20), - "4C9007F4026250C6BC8414F9BF50C86C2D7235DA"); - - /* Case 5. */ - memset(key, 0xaa, 80); - crypto_hmac_sha1(digest, key, 80, - "Test Using Larger Than Block-Size Key - Hash Key First", - 54); - test_streq(hex_str(digest, 20), - "AA4AE5E15272D00E95705637CE8A3B55ED402112"); - /* Test HMAC-SHA256 with test cases from wikipedia and RFC 4231 */ /* Case empty (wikipedia) */

1 0

[tor/master] Remove unused check_fingerprint_syntax
by nickm＠torproject.org 02 Mar '13

02 Mar '13

commit 55ce9bff549c4709ec14486633a4a024a288b59a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 22:01:26 2013 -0500 Remove unused check_fingerprint_syntax --- src/common/crypto.c | 17 ----------------- src/common/crypto.h | 1 - src/test/test_crypto.c | 16 ---------------- 3 files changed, 0 insertions(+), 34 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 8d37400..2f9f3ad 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1294,23 +1294,6 @@ crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out, int add_space) return 0; } -/** Return true iff s is in the correct format for a fingerprint. - */ -int -crypto_pk_check_fingerprint_syntax(const char *s) -{ - int i; - for (i = 0; i < FINGERPRINT_LEN; ++i) { - if ((i%5) == 4) { - if (!TOR_ISSPACE(s[i])) return 0; - } else { - if (!TOR_ISXDIGIT(s[i])) return 0; - } - } - if (s[FINGERPRINT_LEN]) return 0; - return 1; -} - /* symmetric crypto */ /** Return a pointer to the key set for the cipher in env. diff --git a/src/common/crypto.h b/src/common/crypto.h index 1976549..ee356c6 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -183,7 +183,6 @@ crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(crypto_pk_t *pk, char *digest_out); int crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); -int crypto_pk_check_fingerprint_syntax(const char *s); /* symmetric crypto */ const char *crypto_cipher_get_key(crypto_cipher_t *env); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 1f12c87..645fc9f 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -608,22 +608,6 @@ test_crypto_formats(void) tor_free(data2); } - /* Check fingerprint */ - { - test_assert(crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 0000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 00000")); - test_assert(!crypto_pk_check_fingerprint_syntax( - "ACD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000")); - } - done: tor_free(data1); tor_free(data2);

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 02 Mar '13

02 Mar '13

commit 21471b39704e8b7972d45055c84d9fab134a626d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 2 02:46:11 2013 +0000 Update translations for torbirdy_completed --- ko/torbirdy.dtd | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ ko/torbirdy.properties | 19 +++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd new file mode 100644 index 0000000..4d6b51f --- /dev/null +++ b/ko/torbirdy.dtd @@ -0,0 +1,53 @@ +<!ENTITY torbirdy.accountprefs.title "계정 설정"> +<!ENTITY torbirdy.accountprefs.startup.label "시작시에 새로운 메시지 확인"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "매번 새로운 메시지 확인"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "분"> +<!ENTITY torbirdy.accountprefs.cancel.button "취소"> +<!ENTITY torbirdy.accountprefs.save.button "저장"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "Torbirdy 개인 설정"> +<!ENTITY torbirdy.prefs.save.button "저장"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "취소"> +<!ENTITY torbirdy.prefs.extra2.button "설정 테스트"> +<!ENTITY torbirdy.prefs.extra2.key "g"> +<!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> +<!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정"> +<!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다."> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "익명화 서비스 선택"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "사용자 프록시 설정 사용"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "포트"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "투명한 Tor화"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "글로벌"> +<!ENTITY torbirdy.prefs.imap.label "IMAP 계정에 대한 푸시 이메일 지원 활성화 [기본값:비활성화]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "시작시에 지난번에 접근한 메일 폴더 선택 [기본값 : 비활성화, 로컬 폴더 사용]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "수취인의 키 ID를 암호화된 메시지에 넣기 [기본값 : 비활성화]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.confirmemail.label "Enigmail이 활성화되었을 경우 메일을 보내기 전에 확인하기 [기본값 : 확인하지 않음]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "썬더버드의 자동 이메일 환경설정 마법사 활성화 [기본값 : 비활성화]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.account_specific "계정-특징적"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "계정 선택 : "> + +<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router 사용"> +<!ENTITY torbirdy.panel.usejondo.label "JonDo 사용 (프리미엄)"> +<!ENTITY torbirdy.panel.usewhonix.label "Whonix 사용"> +<!ENTITY torbirdy.panel.preferences.label "Torbirdy 개인 설정 열기"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties new file mode 100644 index 0000000..f808ca5 --- /dev/null +++ b/ko/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=Torbirdy 활성화 : Tor +torbirdy.enabled.jondo=Torbirdy 활성화 : JonDo +torbirdy.enabled.custom=Torbirdy 활성화됨 : 개인 프록시 +torbirdy.enabled.torification=TorBirdy 활성화됨 : 투명 Tor화 +torbirdy.enabled.whonix=TorBridy 활성화됨 : Whonix +torbirdy.disabled=TorBirdy: 비활성화 + +torbirdy.email.prompt=TorBirdy는 귀하의 익명을 지키기 위해 썬더버드의 자동 설정 마법사를 비활성시켰습니다. \n\n%5를 위한 추천되는 보안 설정은 이미 설정되었습니다. \n\n귀하는 다른 계정 설정을 수동으로 설정할 수 있습니다. + +torbirdy.email.advanced=TorBirdy의 고급 설정을 바꾸는 것은 추천되지 않음을 알아두십시오.\n\n 귀하는 귀하가 무엇을 하고 있는지 확신할 수 있는 경우에만 계속해야 합니다. +torbirdy.email.advanced.nextwarning=다음번에 경고 보여주기 +torbirdy.email.advanced.title=TorBirdy 고급 설정 + +torbirdy.restart=시간대 설정이 효과를 발휘하려면 썬더버드를 재시작하십시오. + +torbirdy.firstrun=귀하는 지금 TorBirdy를 사용중입니다. \n\n귀하의 익명을 돕기 위해서 TorBirdy는, 귀하나 다른 플러그인에 의해 설정이 바뀌는 것을 막기 위해 썬더버드의 설정을 이미 설정된 것으로 고정할 것입니다. TorBirdy를 통해 접근할 수 있고 바뀔 수 있는 몇몇 설정이 있습니다. TorBirdy가 삭제되거나 비활성화될때, 바뀐 모든 설정은 기본값으로 재설정될 것입니다 (TorBirdy의 설치에 우선하는 값).\n\n만약 새로운 사용자이시라면, 우리가 우리의 사용자를 위해 이루어내기 위해 시도하고 있는 것을 이해하기 위해서, TorBirdy 웹사이트를 읽는 것을 추천합니다. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 02 Mar '13

02 Mar '13

commit ade3e2e3622136eec29e5a71ce08edd84e47a860 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 2 02:46:09 2013 +0000 Update translations for torbirdy --- ko/torbirdy.dtd | 44 ++++++++++++++++++++++---------------------- ko/torbirdy.properties | 22 +++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index bbb9514..4d6b51f 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -1,12 +1,12 @@ <!ENTITY torbirdy.accountprefs.title "계정 설정"> <!ENTITY torbirdy.accountprefs.startup.label "시작시에 새로운 메시지 확인"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label ""> +<!ENTITY torbirdy.accountprefs.minutes.label "매번 새로운 메시지 확인"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "분"> <!ENTITY torbirdy.accountprefs.cancel.button "취소"> <!ENTITY torbirdy.accountprefs.save.button "저장"> -<!ENTITY torbirdy.accountprefs.save.key ""> +<!ENTITY torbirdy.accountprefs.save.key "S"> <!ENTITY torbirdy.prefs.title "Torbirdy 개인 설정"> <!ENTITY torbirdy.prefs.save.button "저장"> @@ -17,37 +17,37 @@ <!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> <!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정"> <!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다."> -<!ENTITY torbirdy.prefs.recommended.key ""> -<!ENTITY torbirdy.prefs.anonservice.text ""> -<!ENTITY torbirdy.prefs.anonservice.key ""> -<!ENTITY torbirdy.prefs.customsettings.text ""> -<!ENTITY torbirdy.prefs.customsettings.key ""> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "익명화 서비스 선택"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "사용자 프록시 설정 사용"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> <!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "포트"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label ""> +<!ENTITY torbirdy.prefs.torification.label "투명한 Tor화"> <!ENTITY torbirdy.prefs.torification.key "t"> -<!ENTITY torbirdy.prefs.global ""> -<!ENTITY torbirdy.prefs.imap.label ""> +<!ENTITY torbirdy.prefs.global "글로벌"> +<!ENTITY torbirdy.prefs.imap.label "IMAP 계정에 대한 푸시 이메일 지원 활성화 [기본값:비활성화]"> <!ENTITY torbirdy.prefs.imap.key "i"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "시작시에 지난번에 접근한 메일 폴더 선택 [기본값 : 비활성화, 로컬 폴더 사용]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "수취인의 키 ID를 암호화된 메시지에 넣기 [기본값 : 비활성화]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> -<!ENTITY torbirdy.prefs.confirmemail.label ""> -<!ENTITY torbirdy.prefs.confirmemail.key ""> -<!ENTITY torbirdy.prefs.emailwizard.label ""> -<!ENTITY torbirdy.prefs.emailwizard.key ""> -<!ENTITY torbirdy.prefs.account_specific ""> +<!ENTITY torbirdy.prefs.confirmemail.label "Enigmail이 활성화되었을 경우 메일을 보내기 전에 확인하기 [기본값 : 확인하지 않음]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "썬더버드의 자동 이메일 환경설정 마법사 활성화 [기본값 : 비활성화]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.account_specific "계정-특징적"> <!ENTITY torbirdy.prefs.select_account.key "C"> -<!ENTITY torbirdy.prefs.select_account.label ""> +<!ENTITY torbirdy.prefs.select_account.label "계정 선택 : "> -<!ENTITY torbirdy.panel.usetor.label ""> -<!ENTITY torbirdy.panel.usejondo.label ""> +<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router 사용"> +<!ENTITY torbirdy.panel.usejondo.label "JonDo 사용 (프리미엄)"> <!ENTITY torbirdy.panel.usewhonix.label "Whonix 사용"> -<!ENTITY torbirdy.panel.preferences.label ""> +<!ENTITY torbirdy.panel.preferences.label "Torbirdy 개인 설정 열기"> -<!ENTITY torbirdy.firstrun.title ""> +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties index 524869a..f808ca5 100644 --- a/ko/torbirdy.properties +++ b/ko/torbirdy.properties @@ -2,18 +2,18 @@ torbirdy.name=TorBirdy torbirdy.enabled.tor=Torbirdy 활성화 : Tor torbirdy.enabled.jondo=Torbirdy 활성화 : JonDo -# torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy -# torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification -# torbirdy.enabled.whonix=TorBirdy Enabled: Whonix -# torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled.custom=Torbirdy 활성화됨 : 개인 프록시 +torbirdy.enabled.torification=TorBirdy 활성화됨 : 투명 Tor화 +torbirdy.enabled.whonix=TorBridy 활성화됨 : Whonix +torbirdy.disabled=TorBirdy: 비활성화 -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy는 귀하의 익명을 지키기 위해 썬더버드의 자동 설정 마법사를 비활성시켰습니다. \n\n%5를 위한 추천되는 보안 설정은 이미 설정되었습니다. \n\n귀하는 다른 계정 설정을 수동으로 설정할 수 있습니다. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time -# torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced=TorBirdy의 고급 설정을 바꾸는 것은 추천되지 않음을 알아두십시오.\n\n 귀하는 귀하가 무엇을 하고 있는지 확신할 수 있는 경우에만 계속해야 합니다. +torbirdy.email.advanced.nextwarning=다음번에 경고 보여주기 +torbirdy.email.advanced.title=TorBirdy 고급 설정 -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=시간대 설정이 효과를 발휘하려면 썬더버드를 재시작하십시오. -# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. -# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy +torbirdy.firstrun=귀하는 지금 TorBirdy를 사용중입니다. \n\n귀하의 익명을 돕기 위해서 TorBirdy는, 귀하나 다른 플러그인에 의해 설정이 바뀌는 것을 막기 위해 썬더버드의 설정을 이미 설정된 것으로 고정할 것입니다. TorBirdy를 통해 접근할 수 있고 바뀔 수 있는 몇몇 설정이 있습니다. TorBirdy가 삭제되거나 비활성화될때, 바뀐 모든 설정은 기본값으로 재설정될 것입니다 (TorBirdy의 설치에 우선하는 값).\n\n만약 새로운 사용자이시라면, 우리가 우리의 사용자를 위해 이루어내기 위해 시도하고 있는 것을 이해하기 위해서, TorBirdy 웹사이트를 읽는 것을 추천합니다. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 02 Mar '13

02 Mar '13

commit 6e5f2b44abd162331bb1970dce4a7fa6836ddce4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 2 02:45:11 2013 +0000 Update translations for orbot --- values-ko/strings.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/values-ko/strings.xml b/values-ko/strings.xml index 612a196..7fd6099 100644 --- a/values-ko/strings.xml +++ b/values-ko/strings.xml @@ -41,6 +41,7 @@ <string name="pref_transparent_port_fallback_summary">경고 : 흔한 포트(80,443 등)만 순환. 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string> <string name="pref_transparent_port_title">포트 목록</string> <string name="pref_transparent_port_summary">프록시 처리할 포트 목록. 만약 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string> + <string name="pref_transparent_port_dialog">프록시 포트 입력</string> <string name="pref_has_root">루트 권한에 대한 접근 필요</string> <string name="pref_has_root_summary">명백한 프록시를 위해 루트 권한 요구</string> <string name="status_install_success">Tor 바이너리가 성공적으로 설치됨!</string> @@ -54,6 +55,8 @@ <string name="btn_okay">확인</string> <string name="btn_cancel">취소</string>  + <string name="wizard_details">몇몇 Orbot 상세사항</string> + <string name="wizard_details_msg">Orbot은 Tor, LibEvent, Privoxy를 포함호고 있는 오픈소스 애플리케이션입니다. Tor 네트워크로 통하는 로컬 HTTTP 프록시(8118)와 SOCKS 프록시(9050)을 제공합니다. Orbot은 루팅된 장치에서 모든 인터넷 트래픽을 Tor를 통해 보내는 능력을 가지고 있습니다.</string> <string name="wizard_permissions_root">사용 권한 부여</string> <string name="wizard_permissions_stock">Orbot 사용 권한</string> <string name="wizard_premissions_msg_root">완벽합니다! Orbot을 위해 루트 권한이 활성화된것을 감지했습니다. 우리는 이 힘을 현명하게 사용할 것입니다.</string> @@ -67,6 +70,10 @@ <string name="wizard_tips_tricks">Orbot이 활성화된 앱</string> <string name="wizard_tips_otrchat">Gibberbot - 안드로이드를 위한 보안 인스턴트 메시징 클라이언트</string> <string name="wizard_tips_proxy">Proxy Settings - Orbot이 작동하도록 앱을 설정하는 방법을 배우기</string> + <string name="wizard_tips_duckgo">DuckDuckGo 검색 엔진 앱</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">프록시 설정</string> <string name="wizard_final">Orbot이 준비됨!</string> <string name="wizard_final_msg">전세계에서 수백만명의 사람들이 다양한 이유로 Tor를 사용합니다.\n\n언론인과 블로거, 인권 운동가, 법 집행 임원, 군인, 기업, 억압하는 정권의 국민, 그리고 평범한 시민 ... 그리고 지금 당신은 준비하고 있습니다!</string> @@ -84,16 +91,22 @@ <string name="wizard_warning_title">경고</string>  <string name="wizard_permissions_title">권한</string> + <string name="wizard_permissions_root_msg1">투명 프록시 같은 고급 기능을 활성화하기 위해 귀하는 선택적으로 Orbot에게 수퍼유저 권한을 줄 수 있습니다.</string> + <string name="wizard_permissions_root_msg2">이것을 원하지 않으신다면, Orbot과 작동하도록 만들어진 앱만을 사용하십시오.</string>  <string name="wizard_tips_title">Orbot이 활성화된 장치</string> + <string name="wizard_tips_gibberbot">Gibberbot: 비공식 보안이 있는 보안 채팅 앱</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Tor를 통해 작동하는 보안 강화 브라우저</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   + <string name="wizard_transproxy_title">투명 프록시</string> + <string name="wizard_transproxy_msg">이것은 어떠한 설정 없이도 귀하의 앱이 자동적으로 Tor 네트워크를 토애 작동하도록 해 줍니다.</string> <string name="button_grant_superuser">수퍼유져 권한 요청</string> <string name="pref_select_apps">앱 </string> <string name="pref_node_configuration_summary">귀하의 익명성을 감소시킬 수 있는 고급 설정이 있습니다.</string> @@ -113,6 +126,7 @@ <string name="exit_nodes">출구 노드</string> <string name="bridges">중계서버</string> <string name="use_bridges">중계서버 사용</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> <string name="ip_address_and_port_of_bridges">중계서버의 IP 주소와 </string> <string name="enter_bridge_addresses">중게서버 주소 입력</string> <string name="relays">중계서버</string> @@ -125,11 +139,15 @@ <string name="enter_a_custom_relay_nickname">임의의 중계서버 별명을 입력</string> <string name="enable_hidden_services">히든 서비스 호스팅</string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">The Tor License</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="default_bridges"></string> + <string name="wizard_locale_title">언어 선택</string> <string name="powered_by">토르 프로젝트에 의해 구동 </string> </resources>

1 0

[torbrowser/master] Bug #6386: Potential fix for New Identity Deadlocks+Crashes
by mikeperry＠torproject.org 02 Mar '13

02 Mar '13

commit ef93b5b3d6c335d56678f1920f793a8236413928 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Mar 1 16:50:01 2013 -0800 Bug #6386: Potential fix for New Identity Deadlocks+Crashes Fix was from https://bugzilla.mozilla.org/show_bug.cgi?id=673543. --- ...-nsICacheService.EvictEntries-synchronous.patch | 12 +++++++----- .../firefox/0016-Prevent-WebSocket-DNS-leak.patch | 2 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- ...er-event-to-filter-the-Drag-Drop-url-list.patch | 2 +- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 2 +- .../0020-Add-canvas-image-extraction-prompt.patch | 2 +- ...nt-window-coordinates-for-mouse-event-scr.patch | 2 +- ...se-physical-screen-info.-via-window-and-w.patch | 2 +- ...not-expose-system-colors-to-CSS-or-canvas.patch | 2 +- ...solate-the-Image-Cache-per-url-bar-domain.patch | 2 +- .../0025-nsIHTTPChannel.redirectTo-API.patch | 2 +- ...26-Isolate-DOM-storage-to-first-party-URI.patch | 2 +- ...nk-to-plugin-manager-for-disabled-plugins.patch | 2 +- 13 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch index b0de192..f16e57b 100644 --- a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch +++ b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch @@ -1,4 +1,4 @@ -From fa4ea3d80ec00ec29bdd286c2269b6370c107fce Mon Sep 17 00:00:00 2001 +From 865601ec4faab63762f896c39fac69ee133d8023 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 16:25:52 -0800 Subject: [PATCH 15/27] Make nsICacheService.EvictEntries synchronous @@ -8,14 +8,14 @@ a brief time (on the order of minutes?) after cache clearing/"New Identity". https://trac.torproject.org/projects/tor/ticket/5715 --- - netwerk/cache/nsCacheService.cpp | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) + netwerk/cache/nsCacheService.cpp | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp -index e88de40..4225742 100644 +index e88de40..5035f68 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp -@@ -1555,7 +1555,19 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) +@@ -1555,7 +1555,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) NS_IMETHODIMP nsCacheService::EvictEntries(nsCacheStoragePolicy storagePolicy) { @@ -28,9 +28,11 @@ index e88de40..4225742 100644 + if (storagePolicy == nsICache::STORE_ANYWHERE && + NS_IsMainThread() && gService && gService->mInitialized) { + nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHESERVICE_EVICTENTRIESFORCLIENT)); ++ gService->mClearingEntries = true; + gService->DoomActiveEntries(); + gService->ClearDoomList(); + (void) SyncWithCacheIOThread(); ++ gService->mClearingEntries = false; + } + return r; } diff --git a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch index 587df41..68cad05 100644 --- a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch +++ b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch @@ -1,4 +1,4 @@ -From fa93f12f0a727b5ed097b7de2e59d473680f4b8c Mon Sep 17 00:00:00 2001 +From 1c0ac4187521b5ee7f6de1a11df3bbc400fa1b53 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:07:37 -0700 Subject: [PATCH 16/27] Prevent WebSocket DNS leak. diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index ecc329b..ddfb184 100644 --- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,4 +1,4 @@ -From e818ee33a8fd443dda1edbda03b16d49cdb5a47d Mon Sep 17 00:00:00 2001 +From cd87b7f64f035f67ec883c1b1ed4746454892781 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 17:38:51 -0800 Subject: [PATCH 17/27] Randomize HTTP request order and pipeline depth. diff --git a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch index 299d9c4..437329b 100644 --- a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch +++ b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch @@ -1,4 +1,4 @@ -From c8c34d3df6d8a6cefdc9acee0520a7b0176aef6d Mon Sep 17 00:00:00 2001 +From 5e505dec0ee00899a1fa22e1759e856bb5381468 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 28 Feb 2013 18:10:16 -0800 Subject: [PATCH 18/27] Emit observer event to filter the Drag+Drop url list diff --git a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch index bf34575..4baf190 100644 --- a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch +++ b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch @@ -1,4 +1,4 @@ -From 5ae9b5b0f8254c9335d770c36e7dad617054ae2e Mon Sep 17 00:00:00 2001 +From f98cbea138095a46570912a2f624b82dff109d55 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 28 Nov 2012 17:08:29 -0500 Subject: [PATCH 19/27] Add mozIThirdPartyUtil.getFirstPartyURI API diff --git a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch index 9dae773..b5d2f93 100644 --- a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch +++ b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch @@ -1,4 +1,4 @@ -From e94cff1b650ca95ae937b2eaac0ef6ec95dec6cd Mon Sep 17 00:00:00 2001 +From 43871b07e1ae9a55136f5a4d4454011eae5569f8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Tue, 27 Nov 2012 13:13:40 -0500 Subject: [PATCH 20/27] Add canvas image extraction prompt. diff --git a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch index e978f2e..0cee032 100644 --- a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch +++ b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch @@ -1,4 +1,4 @@ -From a895a19ed20e59425397ec63b5797bb61d038ed1 Mon Sep 17 00:00:00 2001 +From b0696055ca1d34426ae1c8ce2761404d3261525e Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 10:49:09 -0500 Subject: [PATCH 21/27] Return client window coordinates for mouse event diff --git a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch index 6330a28..621d2a8 100644 --- a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch +++ b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch @@ -1,4 +1,4 @@ -From af28611d01df9d584f69b8ae48fa17a5a9d30ce5 Mon Sep 17 00:00:00 2001 +From 73dd7935b3e9a226e868844bf9a92b257416c5ec Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 11:25:14 -0500 Subject: [PATCH 22/27] Do not expose physical screen info. via window and diff --git a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch index fb6bb18..1db7290 100644 --- a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch +++ b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch @@ -1,4 +1,4 @@ -From cf6f3b4441ff3ad850a04f461b875c2b99b3ec54 Mon Sep 17 00:00:00 2001 +From 6cf784929d122dd2b83536bdd742e9a718027376 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 15:08:40 -0500 Subject: [PATCH 23/27] Do not expose system colors to CSS or canvas. diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch index f603315..6689b66 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From b168d43626d13fe64b33f194778af21114c3549d Mon Sep 17 00:00:00 2001 +From 615c1d7bc870fee55ae37fff0f52b04185c03383 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/27] Isolate the Image Cache per url bar domain. diff --git a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch index f5e42ac..dfcf8ba 100644 --- a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch +++ b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch @@ -1,4 +1,4 @@ -From f24d1c4d3b2d434313b0c7a7c6f0f145794a8797 Mon Sep 17 00:00:00 2001 +From 27633d970ddfa360c553aaf3e8697354309f0839 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon, 14 Jan 2013 19:36:14 -0800 Subject: [PATCH 25/27] nsIHTTPChannel.redirectTo API. diff --git a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch index c2edf99..6a08d8b 100644 --- a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch +++ b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch @@ -1,4 +1,4 @@ -From 1c49a4f4a5312050b03ba8e9d37a073cca049278 Mon Sep 17 00:00:00 2001 +From caf469aa331ab9d92cc83b378cf554f087625dc8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Thu, 28 Feb 2013 18:02:34 -0800 Subject: [PATCH 26/27] Isolate DOM storage to first party URI diff --git a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch index a9f97ea..d023cc9 100644 --- a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch +++ b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch @@ -1,4 +1,4 @@ -From 3725f3f825af99091586aba65b3a14a412d460c5 Mon Sep 17 00:00:00 2001 +From 741804b1300397181bc9a9ba03bda2986ae9c726 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 28 Feb 2013 17:41:57 -0800 Subject: [PATCH 27/27] Remove link to plugin manager for disabled plugins.

1 0

[torbrowser/maint-2.4] Bug #6386: Potential fix for New Identity Deadlocks+Crashes
by mikeperry＠torproject.org 02 Mar '13

02 Mar '13

commit ef93b5b3d6c335d56678f1920f793a8236413928 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Mar 1 16:50:01 2013 -0800 Bug #6386: Potential fix for New Identity Deadlocks+Crashes Fix was from https://bugzilla.mozilla.org/show_bug.cgi?id=673543. --- ...-nsICacheService.EvictEntries-synchronous.patch | 12 +++++++----- .../firefox/0016-Prevent-WebSocket-DNS-leak.patch | 2 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- ...er-event-to-filter-the-Drag-Drop-url-list.patch | 2 +- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 2 +- .../0020-Add-canvas-image-extraction-prompt.patch | 2 +- ...nt-window-coordinates-for-mouse-event-scr.patch | 2 +- ...se-physical-screen-info.-via-window-and-w.patch | 2 +- ...not-expose-system-colors-to-CSS-or-canvas.patch | 2 +- ...solate-the-Image-Cache-per-url-bar-domain.patch | 2 +- .../0025-nsIHTTPChannel.redirectTo-API.patch | 2 +- ...26-Isolate-DOM-storage-to-first-party-URI.patch | 2 +- ...nk-to-plugin-manager-for-disabled-plugins.patch | 2 +- 13 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch index b0de192..f16e57b 100644 --- a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch +++ b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch @@ -1,4 +1,4 @@ -From fa4ea3d80ec00ec29bdd286c2269b6370c107fce Mon Sep 17 00:00:00 2001 +From 865601ec4faab63762f896c39fac69ee133d8023 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 16:25:52 -0800 Subject: [PATCH 15/27] Make nsICacheService.EvictEntries synchronous @@ -8,14 +8,14 @@ a brief time (on the order of minutes?) after cache clearing/"New Identity". https://trac.torproject.org/projects/tor/ticket/5715 --- - netwerk/cache/nsCacheService.cpp | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) + netwerk/cache/nsCacheService.cpp | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp -index e88de40..4225742 100644 +index e88de40..5035f68 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp -@@ -1555,7 +1555,19 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) +@@ -1555,7 +1555,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) NS_IMETHODIMP nsCacheService::EvictEntries(nsCacheStoragePolicy storagePolicy) { @@ -28,9 +28,11 @@ index e88de40..4225742 100644 + if (storagePolicy == nsICache::STORE_ANYWHERE && + NS_IsMainThread() && gService && gService->mInitialized) { + nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHESERVICE_EVICTENTRIESFORCLIENT)); ++ gService->mClearingEntries = true; + gService->DoomActiveEntries(); + gService->ClearDoomList(); + (void) SyncWithCacheIOThread(); ++ gService->mClearingEntries = false; + } + return r; } diff --git a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch index 587df41..68cad05 100644 --- a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch +++ b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch @@ -1,4 +1,4 @@ -From fa93f12f0a727b5ed097b7de2e59d473680f4b8c Mon Sep 17 00:00:00 2001 +From 1c0ac4187521b5ee7f6de1a11df3bbc400fa1b53 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:07:37 -0700 Subject: [PATCH 16/27] Prevent WebSocket DNS leak. diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index ecc329b..ddfb184 100644 --- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,4 +1,4 @@ -From e818ee33a8fd443dda1edbda03b16d49cdb5a47d Mon Sep 17 00:00:00 2001 +From cd87b7f64f035f67ec883c1b1ed4746454892781 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 17:38:51 -0800 Subject: [PATCH 17/27] Randomize HTTP request order and pipeline depth. diff --git a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch index 299d9c4..437329b 100644 --- a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch +++ b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch @@ -1,4 +1,4 @@ -From c8c34d3df6d8a6cefdc9acee0520a7b0176aef6d Mon Sep 17 00:00:00 2001 +From 5e505dec0ee00899a1fa22e1759e856bb5381468 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 28 Feb 2013 18:10:16 -0800 Subject: [PATCH 18/27] Emit observer event to filter the Drag+Drop url list diff --git a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch index bf34575..4baf190 100644 --- a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch +++ b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch @@ -1,4 +1,4 @@ -From 5ae9b5b0f8254c9335d770c36e7dad617054ae2e Mon Sep 17 00:00:00 2001 +From f98cbea138095a46570912a2f624b82dff109d55 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 28 Nov 2012 17:08:29 -0500 Subject: [PATCH 19/27] Add mozIThirdPartyUtil.getFirstPartyURI API diff --git a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch index 9dae773..b5d2f93 100644 --- a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch +++ b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch @@ -1,4 +1,4 @@ -From e94cff1b650ca95ae937b2eaac0ef6ec95dec6cd Mon Sep 17 00:00:00 2001 +From 43871b07e1ae9a55136f5a4d4454011eae5569f8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Tue, 27 Nov 2012 13:13:40 -0500 Subject: [PATCH 20/27] Add canvas image extraction prompt. diff --git a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch index e978f2e..0cee032 100644 --- a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch +++ b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch @@ -1,4 +1,4 @@ -From a895a19ed20e59425397ec63b5797bb61d038ed1 Mon Sep 17 00:00:00 2001 +From b0696055ca1d34426ae1c8ce2761404d3261525e Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 10:49:09 -0500 Subject: [PATCH 21/27] Return client window coordinates for mouse event diff --git a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch index 6330a28..621d2a8 100644 --- a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch +++ b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch @@ -1,4 +1,4 @@ -From af28611d01df9d584f69b8ae48fa17a5a9d30ce5 Mon Sep 17 00:00:00 2001 +From 73dd7935b3e9a226e868844bf9a92b257416c5ec Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 11:25:14 -0500 Subject: [PATCH 22/27] Do not expose physical screen info. via window and diff --git a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch index fb6bb18..1db7290 100644 --- a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch +++ b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch @@ -1,4 +1,4 @@ -From cf6f3b4441ff3ad850a04f461b875c2b99b3ec54 Mon Sep 17 00:00:00 2001 +From 6cf784929d122dd2b83536bdd742e9a718027376 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed, 28 Nov 2012 15:08:40 -0500 Subject: [PATCH 23/27] Do not expose system colors to CSS or canvas. diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch index f603315..6689b66 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From b168d43626d13fe64b33f194778af21114c3549d Mon Sep 17 00:00:00 2001 +From 615c1d7bc870fee55ae37fff0f52b04185c03383 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/27] Isolate the Image Cache per url bar domain. diff --git a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch index f5e42ac..dfcf8ba 100644 --- a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch +++ b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch @@ -1,4 +1,4 @@ -From f24d1c4d3b2d434313b0c7a7c6f0f145794a8797 Mon Sep 17 00:00:00 2001 +From 27633d970ddfa360c553aaf3e8697354309f0839 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon, 14 Jan 2013 19:36:14 -0800 Subject: [PATCH 25/27] nsIHTTPChannel.redirectTo API. diff --git a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch index c2edf99..6a08d8b 100644 --- a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch +++ b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch @@ -1,4 +1,4 @@ -From 1c49a4f4a5312050b03ba8e9d37a073cca049278 Mon Sep 17 00:00:00 2001 +From caf469aa331ab9d92cc83b378cf554f087625dc8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade <brade(a)pearlcrescent.com> Date: Thu, 28 Feb 2013 18:02:34 -0800 Subject: [PATCH 26/27] Isolate DOM storage to first party URI diff --git a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch index a9f97ea..d023cc9 100644 --- a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch +++ b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch @@ -1,4 +1,4 @@ -From 3725f3f825af99091586aba65b3a14a412d460c5 Mon Sep 17 00:00:00 2001 +From 741804b1300397181bc9a9ba03bda2986ae9c726 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 28 Feb 2013 17:41:57 -0800 Subject: [PATCH 27/27] Remove link to plugin manager for disabled plugins.

1 0

[torbutton/master] Misc: Add logs for #6386
by mikeperry＠torproject.org 02 Mar '13

02 Mar '13

commit a7d411c9939b682632274d7b1da562cf56334069 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Mar 1 15:56:48 2013 -0800 Misc: Add logs for #6386 --- src/chrome/content/torbutton.js | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 620214f..8dd8256 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1210,6 +1210,7 @@ function torbutton_new_identity() { */ // Bug 1506 P4: Needed for New Identity. function torbutton_do_new_identity() { + torbutton_log(3, "New Identity: Disabling JS"); torbutton_disable_all_js(); m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", @@ -1234,6 +1235,8 @@ function torbutton_do_new_identity() { } catch(e) { torbutton_log(3, "Exception on wifi token clear: "+e); } + + torbutton_log(3, "New Identity: Closing tabs and clearing searchbox"); torbutton_close_on_toggle(true, true); @@ -1246,12 +1249,16 @@ function torbutton_do_new_identity() { findbox.reset(); gFindBar.close(); } + + torbutton_log(3, "New Identity: Clearing HTTP Auth"); if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"]. getService(Components.interfaces.nsIHttpAuthManager); auth.clearAll(); } + + torbutton_log(3, "New Identity: Clearing Crypto Tokens"); try { var secMgr = Cc["@mozilla.org/security/crypto;1"]. @@ -1295,6 +1302,8 @@ function torbutton_do_new_identity() { var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", tabs); + + torbutton_log(3, "New Identity: Clearing Image Cache"); try { var imgCache = Components.classes["@mozilla.org/image/cache;1"]. @@ -1308,6 +1317,8 @@ function torbutton_do_new_identity() { torbutton_log(4, "Exception on image cache clearing: "+e); } + torbutton_log(3, "New Identity: Clearing Disk Cache"); + var cache = Components.classes["@mozilla.org/network/cache-service;1"]. getService(Components.interfaces.nsICacheService); try { @@ -1316,6 +1327,8 @@ function torbutton_do_new_identity() { torbutton_log(5, "Exception on cache clearing: "+e); window.alert("Torbutton: Unexpected error during cache clearing: "+e); } + + torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage"); if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) { var selector = Components.classes["@torproject.org/cookie-jar-selector;1"] @@ -1327,21 +1340,29 @@ function torbutton_do_new_identity() { } else { torbutton_clear_cookies(); } + + torbutton_log(3, "New Identity: Closing open connections"); // Clear keep-alive var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); obsSvc.notifyObservers(this, "net:prune-all-connections", null); + + torbutton_log(3, "New Identity: Clearing Content Preferences"); // XXX: This may not clear zoom site-specific // browser.content.full-zoom var cps = Cc["@mozilla.org/content-pref/service;1"]. createInstance(Ci.nsIContentPrefService); cps.removeGroupedPrefs(); + + torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); prefService.savePrefFile(null); + + torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym. if (!m_tb_control_pass || !m_tb_control_port) { @@ -1357,6 +1378,8 @@ function torbutton_do_new_identity() { window.alert(warning); } } + + torbutton_log(3, "New Identity: Opening a new browser window"); // Open a new window with the TBB check homepage OpenBrowserWindow();

1 0

[tor/master] Remove the unused parse_addr_and_port_range
by nickm＠torproject.org 01 Mar '13

01 Mar '13

commit 24fb9267268cda0edd9f07ddb298dfe24af760d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 14:35:17 2013 -0500 Remove the unused parse_addr_and_port_range --- src/common/address.c | 87 -------------------------------------------------- src/common/address.h | 3 -- 2 files changed, 0 insertions(+), 90 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 6fc9fb3..67a11d7 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1643,93 +1643,6 @@ parse_port_range(const char *port, uint16_t *port_min_out, return 0; } -/** Parse a string s in the format of - * (IP(/mask|/mask-bits)?|*)(:(*|port(-maxport))?)?, setting the various - * *out pointers as appropriate. Return 0 on success, -1 on failure. - */ -int -parse_addr_and_port_range(const char *s, uint32_t *addr_out, - maskbits_t *maskbits_out, uint16_t *port_min_out, - uint16_t *port_max_out) -{ - char *address; - char *mask, *port, *endptr; - struct in_addr in; - int bits; - - tor_assert(s); - tor_assert(addr_out); - tor_assert(maskbits_out); - tor_assert(port_min_out); - tor_assert(port_max_out); - - address = tor_strdup(s); - /* Break 'address' into separate strings. - */ - mask = strchr(address,'/'); - port = strchr(mask?mask:address,':'); - if (mask) - *mask++ = '\0'; - if (port) - *port++ = '\0'; - /* Now "address" is the IP|'*' part... - * "mask" is the Mask|Maskbits part... - * and "port" is the *|port|min-max part. - */ - - if (strcmp(address,"*")==0) { - *addr_out = 0; - } else if (tor_inet_aton(address, &in) != 0) { - *addr_out = ntohl(in.s_addr); - } else { - log_warn(LD_GENERAL, "Malformed IP %s in address pattern; rejecting.", - escaped(address)); - goto err; - } - - if (!mask) { - if (strcmp(address,"*")==0) - *maskbits_out = 0; - else - *maskbits_out = 32; - } else { - endptr = NULL; - bits = (int) strtol(mask, &endptr, 10); - if (!*endptr) { - /* strtol handled the whole mask. */ - if (bits < 0 || bits > 32) { - log_warn(LD_GENERAL, - "Bad number of mask bits on address range; rejecting."); - goto err; - } - *maskbits_out = bits; - } else if (tor_inet_aton(mask, &in) != 0) { - bits = addr_mask_get_bits(ntohl(in.s_addr)); - if (bits < 0) { - log_warn(LD_GENERAL, - "Mask %s on address range isn't a prefix; dropping", - escaped(mask)); - goto err; - } - *maskbits_out = bits; - } else { - log_warn(LD_GENERAL, - "Malformed mask %s on address range; rejecting.", - escaped(mask)); - goto err; - } - } - - if (parse_port_range(port, port_min_out, port_max_out)<0) - goto err; - - tor_free(address); - return 0; - err: - tor_free(address); - return -1; -} - /** Given an IPv4 in_addr struct *in (in network order, as usual), * write it as a string into the buf_len-byte buffer in * buf. diff --git a/src/common/address.h b/src/common/address.h index 9cbc32c..ec63257 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -219,9 +219,6 @@ int addr_port_lookup(int severity, const char *addrport, char **address, uint32_t *addr, uint16_t *port_out); int parse_port_range(const char *port, uint16_t *port_min_out, uint16_t *port_max_out); -int parse_addr_and_port_range(const char *s, uint32_t *addr_out, - maskbits_t *maskbits_out, uint16_t *port_min_out, - uint16_t *port_max_out); int addr_mask_get_bits(uint32_t mask); int addr_mask_cmp_bits(uint32_t a1, uint32_t a2, maskbits_t bits); /** Length of a buffer to allocate to hold the results of tor_inet_ntoa.*/

1 0