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

[tor-messenger-build/master] Bump ctypes-otr for trac 15179
by arlo＠torproject.org 11 Nov '15

11 Nov '15

commit acb351a813433c60820f6c2defc6f5c6052a0ed3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Nov 10 22:53:17 2015 -0800 Bump ctypes-otr for trac 15179 --- projects/ctypes-otr/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 1cdba96..575332b 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: 518d3b70e206e710c924886fb17aab63ae5b18bf +git_hash: f10fc2ae9f57e27ea1ee2e0fb64790f67318a024 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 10 Nov '15

10 Nov '15

commit e8989e531b0dec2a984d50cd60423230bf7d67fd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 10 21:45:07 2015 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index e29c1c0..baf5b21 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -17,19 +17,21 @@ # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # Valetudinarian <themcnx(a)gmail.com>, 2014 +# yahia zakaria <yahiazak(a)hotmail.com>, 2015 # محمد الحرقان <malham1(a)gmail.com>, 2011 # محيي الدين <tx99h4(a)hotmail.com>, 2014 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-07-22 16:42+0000\n" -"Last-Translator: A. Hassan <a_hassan(a)outlook.com>\n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-11-10 21:25+0000\n" +"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" @@ -44,57 +46,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "عذراً! حدث خطأ في طلبك." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "ابلغ عن خطأ بالبرنامج" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "كود البرنامج" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "التغييرات" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "اتصل بنا" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "حدد الكل" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "أظهر QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode التابع لخطوط جسرك" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "للأسف لم يتم العثور علي ما طلبت" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "يبدو أن هناك خطأ في الحصول على QRCode الخاص بك." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "هذا QRCode يحتوي على خطوط جسرك .اقرأ الرمز بقارئ QRCode لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "لا يوجد أي bridges متاحة حاليا" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "ربما تحتاج إلى %s العودة %s و اختيار نوع bridge مختلف" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "خطوة %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "حمل %s متصفح Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "خطوة %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "احصل على %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "خطوة %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sف%sقط أعطني bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "خيارات متقدمة" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "لا" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "لا شيء" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sن%sعم!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sأ%sصل علي Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[هذه رسالة تلقائية ؛ الرجاء عدم الرد.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "الـ bridges الخاصة بك:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "لقد تخطيت الحد المسموح به. الرجاء الانتظار! الحد الأدنى من الوقت بين الرسائل هو %s ساعات. كل رسائل البريد القادمة خلال تلك الفتره سيتم تجاهلها." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs :(اجمع الـCOMMANDs لتحديد خيارات متعددة في وقت واحد)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "مرحبا بكم في BridgeDB" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "وسائل النقل المتاحه TYPE:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "مرحبا، %s " -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "مرحبا ,صديقي!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "مفاتيح عامة" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -105,7 +232,7 @@ msgstr "هذا البريد تم إنشائه لـ %s يوم %s الساعة %s" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -116,7 +243,7 @@ msgid "" msgstr "BridgeDB يستطيع توفير %s انواع من الـ Pluggable Transports %s وهي تساعد علي تعتيم اتصالاتك بالـ Tor Network، و كنتيجة لذلك يكون من الصعب علي أي احد يراقب حركة مرورك على الإنترنت بتحديد اذا ما كنت تستخدم Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -128,7 +255,7 @@ msgstr "بعض الـ bridges لها عناوين IPv6، ولكنها ليست #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -137,20 +264,20 @@ msgid "" "\n" msgstr "بالأضافة إلي ذلك، BridgeDB يحتوي علي bridges %s عادية بدون أي Pluggable Transports %s تستطيع ايضا المساعدة في التحايل على رقابة على الإنترنت في الكثير من الاحيان.\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "ما هي bridges؟" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s هي عبارة عن مرحلات Tor تساعدك علي التحايل علي الحجب." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -158,12 +285,12 @@ msgid "" "%s, %s or %s." msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "bridges لا تعمل! أنا بحاجة إلى مساعدة!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى %s." @@ -171,48 +298,48 @@ msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "حاول ان تتضمن رسالتك علي معلومات كثيرة عن مشكلتك، بما في ذلك قائمة الـbridges و Pluggable Transports الذي تحاول استخدامهم، ورقم نسخة Tor Browser وأي رسائل اظهرها Tor، إلخ." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "ها هي سطور الـBridges الخاصة بك:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "أحصل علي Bridges" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "من فضلك حدد الخيارات لنوع الـbridge" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "هل تحتاج عناوين IPv6؟" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "هل تحتاج إلي %s؟" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "متصفحك لا يعرض الصور بشكل صحيح" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "أدخل الحروف أو الأرقام من الصورة أعلاه ..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "كيف تبدأ باستعمال الـbridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -221,21 +348,21 @@ msgid "" msgstr "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "عند ظهور شاشة 'إعدادات شبكة Tor'، اضغط علي 'تكوين' و اتبع التعليمات حتي تسألك عن:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "هل يقوم مزود خدمة الإنترنت (ISP) الخاص بك بمنع الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -243,153 +370,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "اختار 'نعم' ثم 'Next' ثم قم بلصق الـbridges الجديدة في المربع. ثم اختار 'اتصال' و اذا واجهتك مشكلة اضغط علي 'مساعدة' في نافذة اعداد Tor." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "أطلب bridges عادية." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "أطلب IPv6 bridges" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "أطلب Pluggable Transport بـ TYPE" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "ابلغ عن خطأ بالبرنامج" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "كود البرنامج" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "التغييرات" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "اتصل بنا" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "حدد البرامج" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "أظهر الرمز المربّع" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "الرمز المربّع التابع لخطوط جسرك" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "للأسف لم يتم العثور علي ما طلبت" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "يبدو أن هناك خطأ في الحصول على الرمز المربّع الخاص بك." - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "هذا الرمز المربّع يحتوي على خطوط جسرك .اقرأ الرمز بقارئ الرموز المربعة لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "لا يوجد أي bridges متاحة حاليا" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "ربما تحتاج إلى %s العودة %s و اختيار نوع bridge مختلف" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "خطوة %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "حمل %s متصفح Tor %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "خطوة %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "احصل على %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "خطوة %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "%sف%sقط أعطني bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "خيارات متقدمة" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "لا" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "لا شيء" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "%sن%sعم!" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sأ%sصل علي Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Nov '15

10 Nov '15

commit 9018f5e71a4118e6c13dc2ad77515d3d60c20853 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 10 21:45:03 2015 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index e29c1c0..baf5b21 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -17,19 +17,21 @@ # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # Valetudinarian <themcnx(a)gmail.com>, 2014 +# yahia zakaria <yahiazak(a)hotmail.com>, 2015 # محمد الحرقان <malham1(a)gmail.com>, 2011 # محيي الدين <tx99h4(a)hotmail.com>, 2014 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-07-22 16:42+0000\n" -"Last-Translator: A. Hassan <a_hassan(a)outlook.com>\n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-11-10 21:25+0000\n" +"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" @@ -44,57 +46,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "عذراً! حدث خطأ في طلبك." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "ابلغ عن خطأ بالبرنامج" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "كود البرنامج" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "التغييرات" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "اتصل بنا" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "حدد الكل" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "أظهر QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode التابع لخطوط جسرك" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "للأسف لم يتم العثور علي ما طلبت" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "يبدو أن هناك خطأ في الحصول على QRCode الخاص بك." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "هذا QRCode يحتوي على خطوط جسرك .اقرأ الرمز بقارئ QRCode لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "لا يوجد أي bridges متاحة حاليا" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "ربما تحتاج إلى %s العودة %s و اختيار نوع bridge مختلف" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "خطوة %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "حمل %s متصفح Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "خطوة %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "احصل على %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "خطوة %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sف%sقط أعطني bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "خيارات متقدمة" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "لا" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "لا شيء" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sن%sعم!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sأ%sصل علي Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[هذه رسالة تلقائية ؛ الرجاء عدم الرد.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "الـ bridges الخاصة بك:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "لقد تخطيت الحد المسموح به. الرجاء الانتظار! الحد الأدنى من الوقت بين الرسائل هو %s ساعات. كل رسائل البريد القادمة خلال تلك الفتره سيتم تجاهلها." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs :(اجمع الـCOMMANDs لتحديد خيارات متعددة في وقت واحد)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "مرحبا بكم في BridgeDB" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "وسائل النقل المتاحه TYPE:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "مرحبا، %s " -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "مرحبا ,صديقي!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "مفاتيح عامة" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -105,7 +232,7 @@ msgstr "هذا البريد تم إنشائه لـ %s يوم %s الساعة %s" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -116,7 +243,7 @@ msgid "" msgstr "BridgeDB يستطيع توفير %s انواع من الـ Pluggable Transports %s وهي تساعد علي تعتيم اتصالاتك بالـ Tor Network، و كنتيجة لذلك يكون من الصعب علي أي احد يراقب حركة مرورك على الإنترنت بتحديد اذا ما كنت تستخدم Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -128,7 +255,7 @@ msgstr "بعض الـ bridges لها عناوين IPv6، ولكنها ليست #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -137,20 +264,20 @@ msgid "" "\n" msgstr "بالأضافة إلي ذلك، BridgeDB يحتوي علي bridges %s عادية بدون أي Pluggable Transports %s تستطيع ايضا المساعدة في التحايل على رقابة على الإنترنت في الكثير من الاحيان.\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "ما هي bridges؟" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s هي عبارة عن مرحلات Tor تساعدك علي التحايل علي الحجب." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -158,12 +285,12 @@ msgid "" "%s, %s or %s." msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "bridges لا تعمل! أنا بحاجة إلى مساعدة!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى %s." @@ -171,48 +298,48 @@ msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "حاول ان تتضمن رسالتك علي معلومات كثيرة عن مشكلتك، بما في ذلك قائمة الـbridges و Pluggable Transports الذي تحاول استخدامهم، ورقم نسخة Tor Browser وأي رسائل اظهرها Tor، إلخ." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "ها هي سطور الـBridges الخاصة بك:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "أحصل علي Bridges" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "من فضلك حدد الخيارات لنوع الـbridge" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "هل تحتاج عناوين IPv6؟" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "هل تحتاج إلي %s؟" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "متصفحك لا يعرض الصور بشكل صحيح" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "أدخل الحروف أو الأرقام من الصورة أعلاه ..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "كيف تبدأ باستعمال الـbridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -221,21 +348,21 @@ msgid "" msgstr "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "عند ظهور شاشة 'إعدادات شبكة Tor'، اضغط علي 'تكوين' و اتبع التعليمات حتي تسألك عن:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "هل يقوم مزود خدمة الإنترنت (ISP) الخاص بك بمنع الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -243,153 +370,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "اختار 'نعم' ثم 'Next' ثم قم بلصق الـbridges الجديدة في المربع. ثم اختار 'اتصال' و اذا واجهتك مشكلة اضغط علي 'مساعدة' في نافذة اعداد Tor." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "أطلب bridges عادية." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "أطلب IPv6 bridges" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "أطلب Pluggable Transport بـ TYPE" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "ابلغ عن خطأ بالبرنامج" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "كود البرنامج" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "التغييرات" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "اتصل بنا" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "حدد البرامج" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "أظهر الرمز المربّع" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "الرمز المربّع التابع لخطوط جسرك" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "للأسف لم يتم العثور علي ما طلبت" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "يبدو أن هناك خطأ في الحصول على الرمز المربّع الخاص بك." - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "هذا الرمز المربّع يحتوي على خطوط جسرك .اقرأ الرمز بقارئ الرموز المربعة لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "لا يوجد أي bridges متاحة حاليا" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "ربما تحتاج إلى %s العودة %s و اختيار نوع bridge مختلف" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "خطوة %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "حمل %s متصفح Tor %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "خطوة %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "احصل على %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "خطوة %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "%sف%sقط أعطني bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "خيارات متقدمة" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "لا" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "لا شيء" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "%sن%sعم!" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sأ%sصل علي Bridges"

1 0

[doctor/master] Resume notifications for urras
by atagar＠torproject.org 10 Nov '15

10 Nov '15

commit 3315ad585498b64e0822c3c5bed6dcd84f129b0b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 10 10:03:02 2015 -0800 Resume notifications for urras Urras is back but not yet voting. Jake is working on it. Resuming notifications for the authority. This reverts commit 74f430475c983a713a19a6a0791aac4fa76850d9. --- consensus_health_checker.py | 7 +------ descriptor_checker.py | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index b4e16a9..1224dfc 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -601,7 +601,7 @@ def has_authority_flag(latest_consensus, consensuses, votes): if Flag.AUTHORITY in desc.flags: seen_authorities.add(desc.nickname) - known_authorities = set(DIRECTORY_AUTHORITIES.keys()) - set(['urras']) + known_authorities = set(DIRECTORY_AUTHORITIES.keys()) missing_authorities = known_authorities.difference(seen_authorities) extra_authorities = seen_authorities.difference(known_authorities) @@ -761,11 +761,6 @@ def _get_documents(label, resource): documents, times_taken, issues = {}, {}, [] for authority in DIRECTORY_AUTHORITIES.values(): - # skip urras, it's having a long outage - - if authority.nickname == 'urras': - continue - if authority.v3ident is None: continue # not a voting authority diff --git a/descriptor_checker.py b/descriptor_checker.py index 434b4d6..05a6513 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -60,11 +60,6 @@ def main(): # download the consensus from each authority for authority in stem.descriptor.remote.get_authorities().values(): - # skip urras, it's having a long outage - - if authority.nickname == 'urras': - continue - # skip authorities that don't vote in the consensus if authority.v3ident is None:

1 0

[webwml/master] Bump RPM package info for Fedora 23
by hiviah＠torproject.org 10 Nov '15

10 Nov '15

commit 65c244899b61d6b9298ca5f2f9da705133a947ca Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Tue Nov 10 16:54:19 2015 +0100 Bump RPM package info for Fedora 23 --- docs/en/rpms.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index 88d63fc..bb0d233 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -27,10 +27,10 @@ torproject.repo. Edit this file with the following information: </p> - <h3>Fedora 21/22 and EL6/7 packages</h3> + <h3>Fedora 22/23 and EL6/7 packages</h3> - <p>For Fedora 21, Fedora 22, RHEL 6, RHEL 7 (and clones), use following - repo file - substitute DISTRIBUTION with one of the following: fc/21, fc/22, + <p>For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following + repo file - substitute DISTRIBUTION with one of the following: fc/22, fc/23, el/6, el/7 according to your distribution. </p>

1 0

[tor/master] Fix the tortls.c unit tests to pass with OpenSSL 1.1.0-dev.
by nickm＠torproject.org 10 Nov '15

10 Nov '15

commit 6512df34a4696a3adb1a2b3207fe7c886376aac5 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Nov 6 19:42:39 2015 +0000 Fix the tortls.c unit tests to pass with OpenSSL 1.1.0-dev. The string description for the states got changed slightly. --- src/test/test_tortls.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 3352ed6..90bf0d3 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -55,6 +55,9 @@ extern tor_tls_context_t *client_tls_context; #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) #define OPENSSL_OPAQUE +#define SSL_STATE_STR "before SSL initialization" +#else +#define SSL_STATE_STR "before/accept initialization" #endif #ifndef OPENSSL_OPAQUE @@ -235,35 +238,35 @@ test_tortls_get_state_description(void *ignored) tls->ssl = SSL_new(ctx); tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in HANDSHAKE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in HANDSHAKE"); tls->state = TOR_TLS_ST_OPEN; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in OPEN"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in OPEN"); tls->state = TOR_TLS_ST_GOTCLOSE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in GOTCLOSE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in GOTCLOSE"); tls->state = TOR_TLS_ST_SENTCLOSE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in SENTCLOSE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in SENTCLOSE"); tls->state = TOR_TLS_ST_CLOSED; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in CLOSED"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in CLOSED"); tls->state = TOR_TLS_ST_RENEGOTIATE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in RENEGOTIATE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in RENEGOTIATE"); tls->state = TOR_TLS_ST_BUFFEREVENT; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR); tls->state = 7; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in unknown TLS state"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in unknown TLS state"); done: SSL_CTX_free(ctx); @@ -412,7 +415,7 @@ test_tortls_log_one_error(void *ignored) tor_tls_log_one_error(tls, 0, LOG_WARN, 0, NULL); tt_int_op(mock_saved_log_number(), OP_EQ, 1); tt_str_op(mock_saved_log_at(0), OP_EQ, "TLS error with 127.hello: (null)" - " (in (null):(null):before/accept initialization)\n"); + " (in (null):(null):" SSL_STATE_STR ")\n"); done: teardown_capture_of_logs(previous_log);

1 0

[tor/master] Every openssl we support has ERR_remove_thread_state
by nickm＠torproject.org 10 Nov '15

10 Nov '15

commit 3aebeeffa5bdea5b1392f0d35175d614053b0acb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 10 10:13:04 2015 -0500 Every openssl we support has ERR_remove_thread_state --- src/common/compat_openssl.h | 2 -- src/common/crypto.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 96c00c7..23f6950 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -24,7 +24,6 @@ #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() -#define tor_ERR_remove_cur_thread_state() ERR_remove_state(0) #ifndef SSL_get_state #define SSL_get_state(ssl) SSL_state(ssl) #endif @@ -33,7 +32,6 @@ ((st) == SSL3_ST_SW_SRVR_HELLO_B)) #define OSSL_HANDSHAKE_STATE int #else -#define tor_ERR_remove_cur_thread_state() ERR_remove_thread_state(NULL) #define STATE_IS_SW_SERVER_HELLO(st) \ ((st) == TLS_ST_SW_SRVR_HELLO) #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index 5feb9be..4c41d44 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -403,7 +403,7 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) void crypto_thread_cleanup(void) { - tor_ERR_remove_cur_thread_state(); + ERR_remove_thread_state(NULL); } /** used by tortls.c: wrap an RSA* in a crypto_pk_t. */ @@ -2690,7 +2690,7 @@ int crypto_global_cleanup(void) { EVP_cleanup(); - tor_ERR_remove_cur_thread_state(); + ERR_remove_thread_state(NULL); ERR_free_strings(); if (dh_param_p)

1 0

[tor/master] Fix compilation with OpenSSL 1.1.0-dev.
by nickm＠torproject.org 10 Nov '15

10 Nov '15

commit 3e3ec750cd72fe1c946d8da6e4f07d87efe3d8ac Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Nov 6 19:02:56 2015 +0000 Fix compilation with OpenSSL 1.1.0-dev. OpenSSL changed the API: * https://github.com/openssl/openssl/commit/5998e2903589e7b19e102ebff06521f2d… * https://github.com/openssl/openssl/commit/b0700d2c8de79252ba605748a075cf2e5… --- changes/bug17549 | 3 +++ src/common/crypto.c | 29 +++++++++++++++++++++++------ src/common/tortls.c | 27 ++++++++++++++++++++++----- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/changes/bug17549 b/changes/bug17549 new file mode 100644 index 0000000..3650608 --- /dev/null +++ b/changes/bug17549 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Repair compilation with the most recent (unreleased, alpha) + vesions of OpenSSL 1.1. Fixes bug 17549. diff --git a/src/common/crypto.c b/src/common/crypto.c index 7b38568..e50a69f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -227,7 +227,11 @@ const char * crypto_openssl_get_version_str(void) { if (crypto_openssl_version_str == NULL) { +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + const char *raw_version = OpenSSL_version(OPENSSL_VERSION); +#else const char *raw_version = SSLeay_version(SSLEAY_VERSION); +#endif crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; @@ -251,11 +255,17 @@ crypto_openssl_get_header_version_str(void) static int crypto_force_rand_ssleay(void) { - if (RAND_get_rand_method() != RAND_SSLeay()) { + RAND_METHOD *default_method; +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + default_method = RAND_OpenSSL(); +#else + default_method = RAND_SSLeay(); +#endif + if (RAND_get_rand_method() != default_method) { log_notice(LD_CRYPTO, "It appears that one of our engines has provided " "a replacement the OpenSSL RNG. Resetting it to the default " "implementation."); - RAND_set_rand_method(RAND_SSLeay()); + RAND_set_rand_method(default_method); return 1; } return 0; @@ -291,16 +301,23 @@ crypto_early_init(void) setup_openssl_threading(); - if (SSLeay() == OPENSSL_VERSION_NUMBER && - !strcmp(SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_TEXT)) { +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + unsigned long version_num = OpenSSL_version_num(); + const char *version_str = OpenSSL_version(OPENSSL_VERSION); +#else + unsigned long version_num = SSLeay(); + const char *version_str = SSLeay_version(SSLEAY_VERSION); +#endif + if (version_num == OPENSSL_VERSION_NUMBER && + !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers " - "(%lx: %s).", SSLeay(), SSLeay_version(SSLEAY_VERSION)); + "(%lx: %s).", version_num, version_str); } else { log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the " "version we're running with. If you get weird crashes, that " "might be why. (Compiled with %lx: %s; running with %lx: %s).", (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + version_num, version_str); } crypto_force_rand_ssleay(); diff --git a/src/common/tortls.c b/src/common/tortls.c index 1057cf4..cd36f9c 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -384,7 +384,11 @@ tor_tls_init(void) #if (SIZEOF_VOID_P >= 8 && \ OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + long version = OpenSSL_version_num(); +#else long version = SSLeay(); +#endif /* LCOV_EXCL_START : we can't test these lines on the same machine */ if (version >= OPENSSL_V_SERIES(1,0,1)) { @@ -1525,7 +1529,6 @@ STATIC void tor_tls_server_info_callback(const SSL *ssl, int type, int val) { tor_tls_t *tls; - int ssl_state; (void) val; tor_tls_debug_state_callback(ssl, type, val); @@ -1533,10 +1536,16 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) if (type != SSL_CB_ACCEPT_LOOP) return; - ssl_state = SSL_state(ssl); +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OSSL_HANDSHAKE_STATE ssl_state = SSL_get_state(ssl); + if (ssl_state == TLS_ST_SW_SRVR_HELLO) + return; +#else + int ssl_state = SSL_state(ssl); if ((ssl_state != SSL3_ST_SW_SRVR_HELLO_A) && (ssl_state != SSL3_ST_SW_SRVR_HELLO_B)) return; +#endif tls = tor_tls_get_by_ssl(ssl); if (tls) { /* Check whether we're watching for renegotiates. If so, this is one! */ @@ -1892,13 +1901,16 @@ int tor_tls_handshake(tor_tls_t *tls) { int r; - int oldstate; tor_assert(tls); tor_assert(tls->ssl); tor_assert(tls->state == TOR_TLS_ST_HANDSHAKE); check_no_tls_errors(); - oldstate = SSL_state(tls->ssl); +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OSSL_HANDSHAKE_STATE oldstate = SSL_get_state(tls->ssl); +#else + int oldstate = SSL_state(tls->ssl); +#endif if (tls->isServer) { log_debug(LD_HANDSHAKE, "About to call SSL_accept on %p (%s)", tls, SSL_state_string_long(tls->ssl)); @@ -1908,7 +1920,12 @@ tor_tls_handshake(tor_tls_t *tls) SSL_state_string_long(tls->ssl)); r = SSL_connect(tls->ssl); } - if (oldstate != SSL_state(tls->ssl)) +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OSSL_HANDSHAKE_STATE newstate = SSL_get_state(tls->ssl); +#else + int newstate = SSL_state(tls->ssl); +#endif + if (oldstate != newstate) log_debug(LD_HANDSHAKE, "After call, %p was in state %s", tls, SSL_state_string_long(tls->ssl)); /* We need to call this here and not earlier, since OpenSSL has a penchant

1 0

[tor/master] Move openssl version compatibility defines into a new header.
by nickm＠torproject.org 10 Nov '15

10 Nov '15

commit c32a43a4d2bbd2be89888fc5a253e55c72bb466a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 10 10:02:21 2015 -0500 Move openssl version compatibility defines into a new header. --- src/common/compat_openssl.h | 41 +++++++++++++++++++++++++++++++++++++++++ src/common/crypto.c | 32 +++----------------------------- src/common/include.am | 1 + src/common/tortls.c | 28 +++++----------------------- src/common/tortls.h | 1 + 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h new file mode 100644 index 0000000..96c00c7 --- /dev/null +++ b/src/common/compat_openssl.h @@ -0,0 +1,41 @@ +/* Copyright (c) 2001, Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_COMPAT_OPENSSL_H +#define TOR_COMPAT_OPENSSL_H + +#include <openssl/opensslv.h> + +/** + * \file compat_openssl.h + * + * \brief compatability definitions for working with different openssl forks + **/ + +#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) +#error "We require OpenSSL >= 1.0.0" +#endif + +#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#define OPENSSL_VERSION SSLEAY_VERSION +#define OpenSSL_version(v) SSLeay_version(v) +#define OpenSSL_version_num() SSLeay() +#define RAND_OpenSSL() RAND_SSLeay() +#define tor_ERR_remove_cur_thread_state() ERR_remove_state(0) +#ifndef SSL_get_state +#define SSL_get_state(ssl) SSL_state(ssl) +#endif +#define STATE_IS_SW_SERVER_HELLO(st) \ + (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ + ((st) == SSL3_ST_SW_SRVR_HELLO_B)) +#define OSSL_HANDSHAKE_STATE int +#else +#define tor_ERR_remove_cur_thread_state() ERR_remove_thread_state(NULL) +#define STATE_IS_SW_SERVER_HELLO(st) \ + ((st) == TLS_ST_SW_SRVR_HELLO) +#endif + +#endif diff --git a/src/common/crypto.c b/src/common/crypto.c index e50a69f..5feb9be 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -21,18 +21,13 @@ #undef OCSP_RESPONSE #endif -#include <openssl/opensslv.h> - #define CRYPTO_PRIVATE #include "crypto.h" +#include "compat_openssl.h" #include "crypto_curve25519.h" #include "crypto_ed25519.h" #include "crypto_format.h" -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) -#error "We require OpenSSL >= 1.0.0" -#endif - #include <openssl/err.h> #include <openssl/rsa.h> #include <openssl/pem.h> @@ -227,11 +222,7 @@ const char * crypto_openssl_get_version_str(void) { if (crypto_openssl_version_str == NULL) { -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) const char *raw_version = OpenSSL_version(OPENSSL_VERSION); -#else - const char *raw_version = SSLeay_version(SSLEAY_VERSION); -#endif crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; @@ -256,11 +247,7 @@ static int crypto_force_rand_ssleay(void) { RAND_METHOD *default_method; -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) default_method = RAND_OpenSSL(); -#else - default_method = RAND_SSLeay(); -#endif if (RAND_get_rand_method() != default_method) { log_notice(LD_CRYPTO, "It appears that one of our engines has provided " "a replacement the OpenSSL RNG. Resetting it to the default " @@ -301,13 +288,8 @@ crypto_early_init(void) setup_openssl_threading(); -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) unsigned long version_num = OpenSSL_version_num(); const char *version_str = OpenSSL_version(OPENSSL_VERSION); -#else - unsigned long version_num = SSLeay(); - const char *version_str = SSLeay_version(SSLEAY_VERSION); -#endif if (version_num == OPENSSL_VERSION_NUMBER && !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers " @@ -421,11 +403,7 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) void crypto_thread_cleanup(void) { -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) - ERR_remove_thread_state(NULL); -#else - ERR_remove_state(0); -#endif + tor_ERR_remove_cur_thread_state(); } /** used by tortls.c: wrap an RSA* in a crypto_pk_t. */ @@ -2712,11 +2690,7 @@ int crypto_global_cleanup(void) { EVP_cleanup(); -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) - ERR_remove_thread_state(NULL); -#else - ERR_remove_state(0); -#endif + tor_ERR_remove_cur_thread_state(); ERR_free_strings(); if (dh_param_p) diff --git a/src/common/include.am b/src/common/include.am index 7de93ba..2fc92e2 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -118,6 +118,7 @@ COMMONHEADERS = \ src/common/ciphers.inc \ src/common/compat.h \ src/common/compat_libevent.h \ + src/common/compat_openssl.h \ src/common/compat_threads.h \ src/common/container.h \ src/common/crypto.h \ diff --git a/src/common/tortls.c b/src/common/tortls.c index cd36f9c..9f9ce0d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -40,9 +40,6 @@ #include <openssl/opensslv.h> #include "crypto.h" -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) -#error "We require OpenSSL >= 1.0.0" -#endif #ifdef OPENSSL_NO_EC #error "We require OpenSSL with ECC support" #endif @@ -384,11 +381,7 @@ tor_tls_init(void) #if (SIZEOF_VOID_P >= 8 && \ OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) long version = OpenSSL_version_num(); -#else - long version = SSLeay(); -#endif /* LCOV_EXCL_START : we can't test these lines on the same machine */ if (version >= OPENSSL_V_SERIES(1,0,1)) { @@ -1536,16 +1529,9 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) if (type != SSL_CB_ACCEPT_LOOP) return; -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) OSSL_HANDSHAKE_STATE ssl_state = SSL_get_state(ssl); - if (ssl_state == TLS_ST_SW_SRVR_HELLO) + if (! STATE_IS_SW_SERVER_HELLO(ssl_state)) return; -#else - int ssl_state = SSL_state(ssl); - if ((ssl_state != SSL3_ST_SW_SRVR_HELLO_A) && - (ssl_state != SSL3_ST_SW_SRVR_HELLO_B)) - return; -#endif tls = tor_tls_get_by_ssl(ssl); if (tls) { /* Check whether we're watching for renegotiates. If so, this is one! */ @@ -1906,11 +1892,9 @@ tor_tls_handshake(tor_tls_t *tls) tor_assert(tls->state == TOR_TLS_ST_HANDSHAKE); check_no_tls_errors(); -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OSSL_HANDSHAKE_STATE oldstate = SSL_get_state(tls->ssl); -#else - int oldstate = SSL_state(tls->ssl); -#endif + if (tls->isServer) { log_debug(LD_HANDSHAKE, "About to call SSL_accept on %p (%s)", tls, SSL_state_string_long(tls->ssl)); @@ -1920,11 +1904,9 @@ tor_tls_handshake(tor_tls_t *tls) SSL_state_string_long(tls->ssl)); r = SSL_connect(tls->ssl); } -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OSSL_HANDSHAKE_STATE newstate = SSL_get_state(tls->ssl); -#else - int newstate = SSL_state(tls->ssl); -#endif + if (oldstate != newstate) log_debug(LD_HANDSHAKE, "After call, %p was in state %s", tls, SSL_state_string_long(tls->ssl)); diff --git a/src/common/tortls.h b/src/common/tortls.h index 1cfe029..a719cb5 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -12,6 +12,7 @@ **/ #include "crypto.h" +#include "compat_openssl.h" #include "compat.h" #include "testsupport.h"

1 0

[tor/master] Fix compilation with OpenSSL 1.1.0 --enable-gcc-warnings is set.
by nickm＠torproject.org 10 Nov '15

10 Nov '15

commit 89cb2e467dd66d659cb9492e0b59c35f5d6bab57 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Nov 6 19:12:43 2015 +0000 Fix compilation with OpenSSL 1.1.0 --enable-gcc-warnings is set. --- src/test/test_tortls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 280e7fa..3352ed6 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -130,7 +130,6 @@ test_tortls_tor_tls_new(void *data) MOCK(tor_tls_cert_matches_key, mock_tls_cert_matches_key); crypto_pk_t *key1 = NULL, *key2 = NULL; SSL_METHOD *method = NULL; - SSL_CTX *ctx = NULL; key1 = pk_generate(2); key2 = pk_generate(3); @@ -148,7 +147,7 @@ test_tortls_tor_tls_new(void *data) #ifndef OPENSSL_OPAQUE method = give_me_a_test_method(); - ctx = SSL_CTX_new(method); + SSL_CTX *ctx = SSL_CTX_new(method); method->num_ciphers = fake_num_ciphers; client_tls_context->ctx = ctx; tls = tor_tls_new(-1, 0);

1 0