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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit af99d2f692b4c4a34159e3e0ff63f2ceaf92848c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 11:45:19 2015 +0000 Update translations for tails-persistence-setup --- ko/ko.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 3cecb52..06a57e3 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -5,13 +5,14 @@ # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 +# Revi_ <revi(a)fastlizard4.org>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-23 11:38+0000\n" +"Last-Translator: Revi_ <revi(a)fastlizard4.org>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,11 +94,11 @@ msgstr "프린터 구성" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" -msgstr "" +msgstr "비트코인 클라이언트" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "" +msgstr "일렉트럼의 비트코인 지갑 및 설정" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit bb63ef67a13358876fb748952851f04bcb2e0502 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 09:15:47 2015 +0000 Update translations for torbutton-torbuttonproperties --- uk/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uk/torbutton.properties b/uk/torbutton.properties index c7809fa..1c092ca 100644 --- a/uk/torbutton.properties +++ b/uk/torbutton.properties @@ -53,10 +53,10 @@ torbutton.popup.short_torbrowser = Важлива інформація Torbutton torbutton.popup.confirm_plugins = Плагіни, такі як Flash, можуть завдати шкоди вашій конфіденційності та анонімності.\\\n\n\\\n\nВони також можуть обходити Tor, щоб розкрити ваше поточне місце розташування і IP-адресу.\\\n\n\\\n\nВи впевнені, що хочете включити плагіни?\\\n\n\\\n torbutton.popup.never_ask_again = Більше ніколи не запитувати -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser закриє всі вікна і вкладки. Всі сеанси на веб-сайтах буде втрачено.\n\nПерезапустити Tor Browser, щоб змінити вашу особистість? torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = Відкрити налаштування безпеки torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. @@ -72,6 +72,6 @@ canvas.neverAccessKey=е # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnly=Ви не можете виконати %S з файлової системи, доступної тільки для читання. Будь ласка, скопіюйте %S в інше місце перед спробую запустити знову. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.

1 0

[obfs4/master] Bump the version to 0.0.6-dev, signifying development towards 0.0.6.
by yawning＠torproject.org 23 Apr '15

23 Apr '15

commit 37a709d8b4fec837c0c88c495e7ea926953d974f Author: Yawning Angel <yawning(a)torproject.org> Date: Thu Apr 23 00:32:25 2015 +0000 Bump the version to 0.0.6-dev, signifying development towards 0.0.6. --- ChangeLog | 2 ++ obfs4proxy/obfs4proxy.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3569518..15de989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 0.0.6 - UNRELEASED: + Changes in version 0.0.5 - 2015-04-15: - Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan. - Changed the go.net import path to the new location (golang.org/x/net) diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 5d13b32..5f7f171 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,7 +51,7 @@ import ( ) const ( - obfs4proxyVersion = "0.0.5" + obfs4proxyVersion = "0.0.6-dev" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" )

1 0

[tor-messenger-build/master] Update binutils to version 2.25
by boklm＠torproject.org 22 Apr '15

22 Apr '15

commit a467d500ac065d9b66b474be201472d423143133 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 23 01:22:37 2015 +0200 Update binutils to version 2.25 --- projects/binutils/config | 2 +- projects/binutils/enable-reloc-section-ld.patch | 48 +++++++++++------------ projects/binutils/peXXigen.patch | 2 +- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/projects/binutils/config b/projects/binutils/config index 9fe26ea..caa0514 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 2.24 +version: 2.25 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 lsb_release: diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index f393f51..15ab4d8 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,10 +1,9 @@ -From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 +From 6ef8bae3d2a4f4704c4a32f786c9574db3e70f25 Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. - --- ld/emultempl/pe.em | 6 +++++ ld/emultempl/pep.em | 8 ++++++- @@ -13,18 +12,18 @@ Patch by skruffy. 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 5d6da9e..14c07f7 100644 +index 979cc8b8e960..4a63863289c8 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -268,6 +268,7 @@ fragment <<EOF - #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) - /* Determinism. */ +@@ -274,6 +274,7 @@ fragment <<EOF #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) static void gld${EMULATION_NAME}_add_options -@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options +@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -32,7 +31,7 @@ index 5d6da9e..14c07f7 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -42,7 +41,7 @@ index 5d6da9e..14c07f7 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) if (link_info.shared #if !defined(TARGET_IS_shpe) || (!link_info.relocatable && pe_def_file->num_exports != 0) @@ -51,20 +50,20 @@ index 5d6da9e..14c07f7 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b738800..b566903 100644 +index b24a60820237..caf294663a80 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -242,7 +242,8 @@ enum options - OPTION_NO_BIND, - OPTION_WDM_DRIVER, +@@ -248,7 +248,8 @@ enum options OPTION_INSERT_TIMESTAMP, -- OPTION_TERMINAL_SERVER_AWARE -+ OPTION_TERMINAL_SERVER_AWARE, + OPTION_NO_INSERT_TIMESTAMP, + OPTION_TERMINAL_SERVER_AWARE, +- OPTION_BUILD_ID ++ OPTION_BUILD_ID, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options +@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +71,7 @@ index b738800..b566903 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,7 +81,7 @@ index b738800..b566903 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1838,6 +1843,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT if (link_info.shared @@ -91,10 +90,10 @@ index b738800..b566903 100644 { pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index e9e133b..4230dc3 100644 +index 61d8fa5c7eea..24c0c72a6685 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; +@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -200,10 +199,10 @@ index e9e133b..4230dc3 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 4697390..2bf71d9 100644 +index 24ea30237aeb..6a0d6338646b 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -31,6 +31,7 @@ extern def_file *pe_def_file; +@@ -30,6 +30,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -211,6 +210,3 @@ index 4697390..2bf71d9 100644 extern int pe_dll_kill_ats; extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; --- -2.0.1 - diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch index 785aa02..f07dcf5 100644 --- a/projects/binutils/peXXigen.patch +++ b/projects/binutils/peXXigen.patch @@ -6,7 +6,7 @@ diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c --- 795,802 ---- /* Only use a real timestamp if the option was chosen. */ if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); + H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); + else + H_PUT_32 (abfd, 0, filehdr_out->f_timdat);

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 22 Apr '15

22 Apr '15

commit 14ad745b0b78e684893f0e6e0855ba4c150210e7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 20:45:07 2015 +0000 Update translations for bridgedb_completed --- fa/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 5e9ebc8..14e1834 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -14,9 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-17 22:11+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-04-22 20:42+0000\n" "Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -37,7 +36,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است." @@ -208,26 +207,27 @@ msgstr "چگونگی از پل‌های خود استفاده کنید" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." -msgstr "برای وارد کردن پل ها در Tor Browser, دنبال کنید دستورالعمل را در %s Tor\nBrowser صفحه دانلود %s برای شروع Tor Browser." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "برای ورود به پل در مرورگر Tor ، برای اولین بار %s به دانلود مرورگر Tor \nصفحه %s و پس از آن به دنبال دستورالعمل دانلود و استفاده از\nمرورگر Tor بروید." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "وقتی که صفحه 'تنظیمات شبکه تور' نمایش داده شد, روی گزینه 'پیکربندی' کلیک کنید و دنبال کنید\nتا زمانی که wizard از شما بپرسد:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "آیا شرکت ارایه دهنده اینترنت (ISP) شما بلاک می کند و یا سانسور می کند ارتباطات\nشبکه تور شما را؟" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -235,29 +235,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "این پیام را نمایش می دهد." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "درخواست پل‌های عادی" -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "درخواست پل‌های IPv6" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "درخواست یک روش Transport جایگزین براساس TYPE" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "دریافت یک کپی از کلید عمومی BridgeDB"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 22 Apr '15

22 Apr '15

commit a623f1099e1d58e977ec470be1414a9945c791bf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 20:45:03 2015 +0000 Update translations for bridgedb --- fa/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index a4c7fe5..14e1834 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-22 20:42+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,7 +210,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "برای ورود به پل در مرورگر Tor ، برای اولین بار %s به دانلود مرورگر Tor \nصفحه %s و پس از آن به دنبال دستورالعمل دانلود و استفاده از\nمرورگر Tor بروید." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[tor-browser-bundle/master] Update the updater config file
by gk＠torproject.org 22 Apr '15

22 Apr '15

commit e3cc7044dbec5ff8fd834c06bf486da03c9dc311 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 22 20:28:49 2015 +0000 Update the updater config file --- tools/update-responses/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1475195..8c6110d 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,6 +10,7 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 4.5 + release: 4.5 versions: 4.5: platformVersion: 31.6.0 @@ -17,6 +18,7 @@ versions: download_url: https://www.torproject.org/dist/torbrowser/4.5 incremental_from: - 4.5a5 + - 4.0.8 migrate_archs: osx32: osx64 osx32:

1 0

[torsocks/master] Fix the broken getpeername() implementation.
by dgoulet＠torproject.org 22 Apr '15

22 Apr '15

commit 2c060e39201effd50d28a6107135fda9ea2ce908 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Mar 28 15:23:07 2015 +0000 Fix the broken getpeername() implementation. Signed-off-by: Yawning Angel <yawning(a)schwanenlied.me> --- src/lib/getpeername.c | 24 +++++++++--------------- tests/test_getpeername.c | 12 +++++++----- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/lib/getpeername.c b/src/lib/getpeername.c index bd93a2b..d8bf701 100644 --- a/src/lib/getpeername.c +++ b/src/lib/getpeername.c @@ -33,6 +33,7 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) { int ret = 0; struct connection *conn; + socklen_t sz = 0; DBG("[getpeername] Requesting address on socket %d", sockfd); @@ -51,19 +52,9 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) } /* - * Extra check for addrlen since we are about to copy the connection - * content into the given address. - */ - if (*addrlen > sizeof(struct sockaddr)) { - /* Ref to the manpage for the returned value here. */ - errno = EINVAL; - ret = -1; - goto end; - } - - /* - * Copy connected destination address into the given addr with only the - * given len so we don't overflow on purpose. + * Copy the minimum of *addrlen and the size of the actual address + * into the given addr. There are applications that pass in buffers + * that are rather large, which is acceptable behavior. */ switch (conn->dest_addr.domain) { case CONNECTION_DOMAIN_NAME: @@ -73,16 +64,19 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) * that has been returned to the application. */ case CONNECTION_DOMAIN_INET: + sz = min(sizeof(conn->dest_addr.u.sin), *addrlen); memcpy(addr, (const struct sockaddr *) &conn->dest_addr.u.sin, - *addrlen); + sz); break; case CONNECTION_DOMAIN_INET6: + sz = min(sizeof(conn->dest_addr.u.sin6), *addrlen); memcpy(addr, (const struct sockaddr *) &conn->dest_addr.u.sin6, - *addrlen); + sz); break; } /* Success. */ + *addrlen = sz; errno = 0; ret = 0; diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c index 516596e..df464d2 100644 --- a/tests/test_getpeername.c +++ b/tests/test_getpeername.c @@ -32,6 +32,7 @@ static void test_getpeername(void) char buf[INET_ADDRSTRLEN]; struct sockaddr addr; struct sockaddr_in addrv4; + struct sockaddr_storage ss; socklen_t addrlen; const char *ip = "93.95.227.222"; @@ -68,11 +69,7 @@ static void test_getpeername(void) goto error; } - /* Very large addrlen. */ - addrlen = -1; - ret = getpeername(inet_sock, &addr, &addrlen); - ok(ret == -1 && errno == EINVAL, "Invalid addrlen"); - + /* Invalid arguments */ addrlen = sizeof(addr); ret = getpeername(inet_sock, NULL, &addrlen); ok(ret == -1 && errno == EFAULT, "Invalid addr ptr"); @@ -90,6 +87,11 @@ static void test_getpeername(void) ok(ret == 0 && strncmp(buf, ip, strlen(ip)) == 0, "Valid returned IP address from getpeername()"); + /* Large but valid addrlen. */ + addrlen = sizeof(ss); + ret = getpeername(inet_sock, (struct sockaddr *)&ss, &addrlen); + ok(ret == 0 && addrlen == sizeof(addrv4), "Valid returned IP address from getpeername(), large addrlen"); + error: if (inet_sock >= 0) { close(inet_sock);

1 0

[torsocks/master] Merge remote-tracking branch 'yawning/getpeername'
by dgoulet＠torproject.org 22 Apr '15

22 Apr '15

commit d38e2c4d2fdbd52c81d0e43b3ab5090f42cef426 Merge: 824d88b 2c060e3 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Apr 22 16:15:07 2015 -0400 Merge remote-tracking branch 'yawning/getpeername' src/lib/getpeername.c | 24 +++++++++--------------- tests/test_getpeername.c | 12 +++++++----- 2 files changed, 16 insertions(+), 20 deletions(-)

1 0

[torsocks/master] Fix: indentation in getpeername test
by dgoulet＠torproject.org 22 Apr '15

22 Apr '15

commit 2845ef59eeb4e19e46c6a27059c3e0997ffbe9d2 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Apr 22 16:16:49 2015 -0400 Fix: indentation in getpeername test Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- tests/test_getpeername.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c index df464d2..faf4149 100644 --- a/tests/test_getpeername.c +++ b/tests/test_getpeername.c @@ -90,7 +90,8 @@ static void test_getpeername(void) /* Large but valid addrlen. */ addrlen = sizeof(ss); ret = getpeername(inet_sock, (struct sockaddr *)&ss, &addrlen); - ok(ret == 0 && addrlen == sizeof(addrv4), "Valid returned IP address from getpeername(), large addrlen"); + ok(ret == 0 && addrlen == sizeof(addrv4), + "Valid returned IP address from getpeername(), large addrlen"); error: if (inet_sock >= 0) {

1 0