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

[torbrowser/maint-2.4] Fix the depth check in the pipeline patch.
by mikeperry＠torproject.org 12 Apr '13

12 Apr '13

commit e405e56d178b5d456278921050d4e7ae8e21e51f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Apr 11 19:43:43 2013 -0700 Fix the depth check in the pipeline patch. Also improve log message. --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 47 ++++++++++---------- 1 files changed, 24 insertions(+), 23 deletions(-) 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 f7dab44..a82e429 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 468117ab9f414332429406e588ad81fa7b3c72fa Mon Sep 17 00:00:00 2001 +From 6043bc14b28d49618e7882707c56b2fac4ada2a9 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/28] Randomize HTTP request order and pipeline depth. @@ -36,15 +36,15 @@ request representation that will allow more requests to be packed inside Tor cells. If you have interest in evaluating SPDY in a study of Website Traffic Fingerprinting, please contact me. --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 297 +++++++++++++++++-------- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 298 +++++++++++++++++-------- netwerk/protocol/http/nsHttpConnectionMgr.h | 15 +- netwerk/protocol/http/nsHttpHandler.h | 2 + - netwerk/protocol/http/nsHttpPipeline.cpp | 62 +++++- + netwerk/protocol/http/nsHttpPipeline.cpp | 62 ++++- netwerk/protocol/http/nsHttpPipeline.h | 3 + - 5 files changed, 281 insertions(+), 98 deletions(-) + 5 files changed, 282 insertions(+), 98 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 133c301..81ea113 100644 +index 133c301..69de433 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -20,6 +20,8 @@ @@ -204,11 +204,11 @@ index 133c301..81ea113 100644 + // limit to allow us to try to get there. Don't give + // too much slack, though, or we'll tend to have + // request packages of the same size when we have -+ // many content elements appear. -+ if (maxdepth <= -+ (pipelineDepth - -+ PR_MIN(mMaxOptimisticPipelinedRequests, -+ requestLen + allClasses))) ++ // many content elements appear at once. ++ if (maxdepth + ++ PR_MIN(mMaxOptimisticPipelinedRequests, ++ requestLen + allClasses) ++ <= pipelineDepth) continue; - if (!bestConn || (connLength < bestConnLength)) { @@ -254,22 +254,23 @@ index 133c301..81ea113 100644 activeTrans = bestConn->Transaction(); nsresult rv = activeTrans->AddTransaction(trans); -@@ -1343,6 +1431,14 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1343,6 +1431,15 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, LOG((" scheduling trans %p on pipeline at position %d\n", trans, trans->PipelinePosition())); +#ifdef WTF_DEBUG + pipeline = activeTrans->QueryPipeline(); -+ fprintf(stderr, "WTF-depth: Added trans to %s of %d/%d/%d/%d pipelines. Request len %d/%d for %s\n", ++ fprintf(stderr, ++ "WTF-depth: Added trans to %s of %d/%d/%d/%d pipelines. Request len %d/%d/%d for %s\n", + type, bestConns.Length(), betterConns.Length(), validConns.Length(), + numPipelines, pipeline->RequestDepth(), activeTrans->PipelineDepth(), -+ ent->mConnInfo->Host()); ++ maxdepth, ent->mConnInfo->Host()); +#endif + if ((ent->PipelineState() == PS_YELLOW) && (trans->PipelinePosition() > 1)) ent->SetYellowConnection(bestConn); return true; -@@ -1403,26 +1499,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1403,26 +1500,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, nsHttpTransaction::Classifier classification = trans->Classification(); uint8_t caps = trans->Caps(); @@ -298,7 +299,7 @@ index 133c301..81ea113 100644 // step 0 // look for existing spdy connection - that's always best because it is // essentially pipelining without head of line blocking -@@ -1436,20 +1518,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1436,20 +1519,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -338,7 +339,7 @@ index 133c301..81ea113 100644 nsRefPtr<nsHttpConnection> conn; while (!conn && (ent->mIdleConns.Length() > 0)) { conn = ent->mIdleConns[0]; -@@ -1483,21 +1572,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1483,21 +1573,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -362,7 +363,7 @@ index 133c301..81ea113 100644 nsresult rv = MakeNewConnection(ent, trans); if (NS_SUCCEEDED(rv)) { // this function returns NOT_AVAILABLE for asynchronous connects -@@ -1510,17 +1586,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1510,17 +1587,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, return rv; } } @@ -389,7 +390,7 @@ index 133c301..81ea113 100644 return NS_ERROR_NOT_AVAILABLE; /* queue it */ } -@@ -1590,10 +1665,20 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, +@@ -1590,10 +1666,20 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, if (!NS_SUCCEEDED(rv)) return rv; transaction = pipeline; @@ -410,7 +411,7 @@ index 133c301..81ea113 100644 } nsRefPtr<nsConnectionHandle> handle = new nsConnectionHandle(conn); -@@ -1692,27 +1777,15 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) +@@ -1692,27 +1778,15 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) "Sticky Connection Not In Active List"); trans->SetConnection(nullptr); rv = DispatchTransaction(ent, trans, conn); @@ -441,7 +442,7 @@ index 133c301..81ea113 100644 } -@@ -2311,13 +2384,37 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) +@@ -2311,13 +2385,37 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) if (preferredEntry) ent = preferredEntry; @@ -480,7 +481,7 @@ index 133c301..81ea113 100644 nsHttpConnectionMgr::nsConnectionHandle::IsPersistent() { return mConn->IsPersistent(); -@@ -2852,9 +2949,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) +@@ -2852,9 +2950,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) { NS_ADDREF(mConnInfo); if (gHttpHandler->GetPipelineAggressive()) { @@ -495,7 +496,7 @@ index 133c301..81ea113 100644 mInitialGreenDepth = mGreenDepth; memset(mPipeliningClassPenalty, 0, sizeof(int16_t) * nsAHttpTransaction::CLASS_MAX); } -@@ -2892,8 +2993,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2892,8 +2994,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( LOG(("Transaction completed at pipeline depth of %d. Host = %s\n", depth, mConnInfo->Host())); @@ -507,7 +508,7 @@ index 133c301..81ea113 100644 } nsAHttpTransaction::Classifier classification; -@@ -2921,6 +3023,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2921,6 +3024,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( mPipelineState, mConnInfo->Host())); mPipelineState = PS_RED; mPipeliningPenalty = 0;

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 11 Apr '13

11 Apr '13

commit 725f85cdb8fa368072fc821f582bc7a164383cb3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 22:15:10 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 5cadb05..77528a8 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-11 21:44+0000\n" +"PO-Revision-Date: 2013-04-11 22:10+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -330,13 +330,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "أسهل طريقة لفتح الملفات التي حملتها هي باستخدام برنامج 7-Zip و هو برنامج مجاني لفك ضغط الملفات. يمكنك تحميله من هنا:\n\nhttp://www.7-zip.org/" +msgstr "أسهل طريقة لفتح الملفات التي حملتها هي باستخدام برنامج 7-Zip\nو هو برنامج مجاني لفك ضغط الملفات. إذا لم يكن مثبت اصلاً \nعلي جهازك, يمكنك تحميله من هنا:\n\nhttp://www.7-zip.org/" #: lib/gettor/i18n.py:211 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "عندما تتم تحميل برنامج 7-zip , تستطيع أن تفتح الملف المضغوط الذي أرسلناه لك بالنقر المضاعف عليه." +msgstr "عندما ينتهي 7-zip من تثبيت نفسه, تستطيع أن تفتح ملف .z المضغوط الذي تسلمته منا بالنقر المضاعف عليه." #: lib/gettor/i18n.py:214 msgid "" @@ -344,13 +344,13 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "أحد الطرق البديلة لتحميل ملفات بصيغة z هي بإعادة تسمية الملف إلى صيغة .zip و من ثم يمكنك فك الضغط باستخدام آي برنامج لفك الضغط لديك" +msgstr "أحد الطرق البديلة لفك ضغط ملفات بصيغة z. هي بإعادة تسمية الملف إلى صيغة\nzip. و من ثم يمكنك فك الضغط باستخدام آي برنامج لفك الضغط مثبت سلفاً علي جهازك." #: lib/gettor/i18n.py:219 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" -msgstr "يرجى الرد على هذه الرسالة البريدية، و أعطني اسم حزمة واحدة. هذا شرح بسيط عن ماهية هذه الحزم:" +msgstr "يرجى الرد على هذه الرسالة البريدية، و أعطني اسم حزمة واحدة في اي اي مكان\nفي مضمون الرسالة. هذا شرح بسيط عن ماهية هذه الحزم:" #: lib/gettor/i18n.py:222 msgid "" @@ -358,14 +358,14 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "وندوز:\n\nحزمة متصفح تور لوندوز. يمكنك استخدامها مع أغلب أنظمة وندوز." +msgstr "ويندوز:\nحزمة متصفح تور لنظام تشغيل ويندوز.\nلا يهم بأي نسخة من ويندوز تستعمل xp, 7 أو ڤيستا, هذه هي الحزمة الذي من المفترض ان تستخدمها." #: lib/gettor/i18n.py:227 msgid "" "macos-i386:\n" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." -msgstr "ماكنتوش- انتل:\n\nحزمة متصفح تور للماكنتوش (معالج انتل). بشكل عام يفضل استخدام هذه النسخة لأجهزة ماك الجديدة." +msgstr "ماكنتوش-انتل i386 :\nحزمة متصفح تور للماكنتوش, معالج انتل. بشكل\nعام, اجهزة الماك الجديدة سوف تطلب منك استخدام هذه الحزمة." #: lib/gettor/i18n.py:231 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 Apr '13

11 Apr '13

commit 1500a2cedf9fb27c1db7360105b002f8c8c0f600 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 22:15:06 2013 +0000 Update translations for gettor --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 5cadb05..77528a8 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-11 21:44+0000\n" +"PO-Revision-Date: 2013-04-11 22:10+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -330,13 +330,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "أسهل طريقة لفتح الملفات التي حملتها هي باستخدام برنامج 7-Zip و هو برنامج مجاني لفك ضغط الملفات. يمكنك تحميله من هنا:\n\nhttp://www.7-zip.org/" +msgstr "أسهل طريقة لفتح الملفات التي حملتها هي باستخدام برنامج 7-Zip\nو هو برنامج مجاني لفك ضغط الملفات. إذا لم يكن مثبت اصلاً \nعلي جهازك, يمكنك تحميله من هنا:\n\nhttp://www.7-zip.org/" #: lib/gettor/i18n.py:211 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "عندما تتم تحميل برنامج 7-zip , تستطيع أن تفتح الملف المضغوط الذي أرسلناه لك بالنقر المضاعف عليه." +msgstr "عندما ينتهي 7-zip من تثبيت نفسه, تستطيع أن تفتح ملف .z المضغوط الذي تسلمته منا بالنقر المضاعف عليه." #: lib/gettor/i18n.py:214 msgid "" @@ -344,13 +344,13 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "أحد الطرق البديلة لتحميل ملفات بصيغة z هي بإعادة تسمية الملف إلى صيغة .zip و من ثم يمكنك فك الضغط باستخدام آي برنامج لفك الضغط لديك" +msgstr "أحد الطرق البديلة لفك ضغط ملفات بصيغة z. هي بإعادة تسمية الملف إلى صيغة\nzip. و من ثم يمكنك فك الضغط باستخدام آي برنامج لفك الضغط مثبت سلفاً علي جهازك." #: lib/gettor/i18n.py:219 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" -msgstr "يرجى الرد على هذه الرسالة البريدية، و أعطني اسم حزمة واحدة. هذا شرح بسيط عن ماهية هذه الحزم:" +msgstr "يرجى الرد على هذه الرسالة البريدية، و أعطني اسم حزمة واحدة في اي اي مكان\nفي مضمون الرسالة. هذا شرح بسيط عن ماهية هذه الحزم:" #: lib/gettor/i18n.py:222 msgid "" @@ -358,14 +358,14 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "وندوز:\n\nحزمة متصفح تور لوندوز. يمكنك استخدامها مع أغلب أنظمة وندوز." +msgstr "ويندوز:\nحزمة متصفح تور لنظام تشغيل ويندوز.\nلا يهم بأي نسخة من ويندوز تستعمل xp, 7 أو ڤيستا, هذه هي الحزمة الذي من المفترض ان تستخدمها." #: lib/gettor/i18n.py:227 msgid "" "macos-i386:\n" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." -msgstr "ماكنتوش- انتل:\n\nحزمة متصفح تور للماكنتوش (معالج انتل). بشكل عام يفضل استخدام هذه النسخة لأجهزة ماك الجديدة." +msgstr "ماكنتوش-انتل i386 :\nحزمة متصفح تور للماكنتوش, معالج انتل. بشكل\nعام, اجهزة الماك الجديدة سوف تطلب منك استخدام هذه الحزمة." #: lib/gettor/i18n.py:231 msgid ""

1 0

[tor/master] Fix two dump bugs in "whether we can use curve25519-donna-c64" test
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit e9e430403cb70e18ae3c22e47d24c189be8e492c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 10:07:41 2013 -0400 Fix two dump bugs in "whether we can use curve25519-donna-c64" test Dumb bug 1: == has higher precedence than &. Dumb bug 2: the main() function in an AC_RUN_IFELSE test is expected to return 0 on success, not 1. --- changes/bug8587 | 5 +++++ configure.ac | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug8587 b/changes/bug8587 new file mode 100644 index 0000000..84d2f1e --- /dev/null +++ b/changes/bug8587 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Build Tor correctly on 32-bit platforms where the compiler can build + but not run code using the "uint128_t" construction. Fixes bug 8587; + bugfix on 0.2.4.8-alpha. + diff --git a/configure.ac b/configure.ac index ed452cb..8a79653 100644 --- a/configure.ac +++ b/configure.ac @@ -667,10 +667,11 @@ if test x$enable_curve25519 != xno; then uint64_t a = ((uint64_t)2000000000) * 1000000000; uint64_t b = ((uint64_t)1234567890) << 24; uint128_t c = ((uint128_t)a) * b; - return ((uint64_t)(c>>96)) == 522859 && - ((uint64_t)(c>>64))&0xffffffffL == 3604448702L && - ((uint64_t)(c>>32))&0xffffffffL == 2351960064L && - ((uint64_t)(c))&0xffffffffL == 0; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=yes], [tor_cv_can_use_curve25519_donna_c64=no], @@ -682,10 +683,11 @@ if test x$enable_curve25519 != xno; then uint64_t a = ((uint64_t)2000000000) * 1000000000; uint64_t b = ((uint64_t)1234567890) << 24; uint128_t c = ((uint128_t)a) * b; - return ((uint64_t)(c>>96)) == 522859 && - ((uint64_t)(c>>64))&0xffffffffL == 3604448702L && - ((uint64_t)(c>>32))&0xffffffffL == 2351960064L && - ((uint64_t)(c))&0xffffffffL == 0; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=cross], [tor_cv_can_use_curve25519_donna_c64=no])])])

1 0

[tor/master] Better test program for 128-bit math support
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 85e7de68bcfe6b137e0d4bb5fbfdc5f4a3db6a2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:52:26 2013 -0400 Better test program for 128-bit math support Clang 3.2 does constant-folding and variable substitution to determine that the program is equivalent to "return 1". Splitting the 128-bit math into a new function seems sufficient to fix this. --- configure.ac | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 8a79653..6f40ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -663,32 +663,38 @@ if test x$enable_curve25519 != xno; then [AC_LANG_PROGRAM([dnl #include <stdint.h> typedef unsigned uint128_t __attribute__((mode(TI))); - ], [dnl - uint64_t a = ((uint64_t)2000000000) * 1000000000; - uint64_t b = ((uint64_t)1234567890) << 24; - uint128_t c = ((uint128_t)a) * b; - int ok = ((uint64_t)(c>>96)) == 522859 && + int func(uint64_t a, uint64_t b) { + uint128_t c = ((uint128_t)a) * b; + int ok = ((uint64_t)(c>>96)) == 522859 && (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && (((uint64_t)(c))&0xffffffffL) == 0; + return ok; + } + ], [dnl + int ok = func( ((uint64_t)2000000000) * 1000000000, + ((uint64_t)1234567890) << 24); return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=yes], [tor_cv_can_use_curve25519_donna_c64=no], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([dnl - #include <stdint.h> - typedef unsigned uint128_t __attribute__((mode(TI))); - ], [dnl - uint64_t a = ((uint64_t)2000000000) * 1000000000; - uint64_t b = ((uint64_t)1234567890) << 24; - uint128_t c = ((uint128_t)a) * b; - int ok = ((uint64_t)(c>>96)) == 522859 && - (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && - (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && - (((uint64_t)(c))&0xffffffffL) == 0; - return !ok; - ])], + #include <stdint.h> + typedef unsigned uint128_t __attribute__((mode(TI))); + int func(uint64_t a, uint64_t b) { + uint128_t c = ((uint128_t)a) * b; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return ok; + } + ], [dnl + int ok = func( ((uint64_t)2000000000) * 1000000000, + ((uint64_t)1234567890) << 24); + return !ok; + ])], [tor_cv_can_use_curve25519_donna_c64=cross], [tor_cv_can_use_curve25519_donna_c64=no])])])

1 0

[tor/master] Merge branch 'bug8587_v3' into maint-0.2.4
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit a1178cdbcf1f99715204567152635a57c705af0e Merge: d028c00 85e7de6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 18:12:44 2013 -0400 Merge branch 'bug8587_v3' into maint-0.2.4 changes/bug8587 | 5 +++++ configure.ac | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 18 deletions(-)

1 0

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

11 Apr '13

commit d39f7138063125b92f738715ca1bcd53f5ef147c Merge: f2e7271 a1178cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 18:13:45 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8587 | 5 +++++ configure.ac | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 18 deletions(-)

1 0

[tor/maint-0.2.4] Fix two dump bugs in "whether we can use curve25519-donna-c64" test
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit e9e430403cb70e18ae3c22e47d24c189be8e492c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 10:07:41 2013 -0400 Fix two dump bugs in "whether we can use curve25519-donna-c64" test Dumb bug 1: == has higher precedence than &. Dumb bug 2: the main() function in an AC_RUN_IFELSE test is expected to return 0 on success, not 1. --- changes/bug8587 | 5 +++++ configure.ac | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug8587 b/changes/bug8587 new file mode 100644 index 0000000..84d2f1e --- /dev/null +++ b/changes/bug8587 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Build Tor correctly on 32-bit platforms where the compiler can build + but not run code using the "uint128_t" construction. Fixes bug 8587; + bugfix on 0.2.4.8-alpha. + diff --git a/configure.ac b/configure.ac index ed452cb..8a79653 100644 --- a/configure.ac +++ b/configure.ac @@ -667,10 +667,11 @@ if test x$enable_curve25519 != xno; then uint64_t a = ((uint64_t)2000000000) * 1000000000; uint64_t b = ((uint64_t)1234567890) << 24; uint128_t c = ((uint128_t)a) * b; - return ((uint64_t)(c>>96)) == 522859 && - ((uint64_t)(c>>64))&0xffffffffL == 3604448702L && - ((uint64_t)(c>>32))&0xffffffffL == 2351960064L && - ((uint64_t)(c))&0xffffffffL == 0; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=yes], [tor_cv_can_use_curve25519_donna_c64=no], @@ -682,10 +683,11 @@ if test x$enable_curve25519 != xno; then uint64_t a = ((uint64_t)2000000000) * 1000000000; uint64_t b = ((uint64_t)1234567890) << 24; uint128_t c = ((uint128_t)a) * b; - return ((uint64_t)(c>>96)) == 522859 && - ((uint64_t)(c>>64))&0xffffffffL == 3604448702L && - ((uint64_t)(c>>32))&0xffffffffL == 2351960064L && - ((uint64_t)(c))&0xffffffffL == 0; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=cross], [tor_cv_can_use_curve25519_donna_c64=no])])])

1 0

[tor/maint-0.2.4] Better test program for 128-bit math support
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 85e7de68bcfe6b137e0d4bb5fbfdc5f4a3db6a2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:52:26 2013 -0400 Better test program for 128-bit math support Clang 3.2 does constant-folding and variable substitution to determine that the program is equivalent to "return 1". Splitting the 128-bit math into a new function seems sufficient to fix this. --- configure.ac | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 8a79653..6f40ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -663,32 +663,38 @@ if test x$enable_curve25519 != xno; then [AC_LANG_PROGRAM([dnl #include <stdint.h> typedef unsigned uint128_t __attribute__((mode(TI))); - ], [dnl - uint64_t a = ((uint64_t)2000000000) * 1000000000; - uint64_t b = ((uint64_t)1234567890) << 24; - uint128_t c = ((uint128_t)a) * b; - int ok = ((uint64_t)(c>>96)) == 522859 && + int func(uint64_t a, uint64_t b) { + uint128_t c = ((uint128_t)a) * b; + int ok = ((uint64_t)(c>>96)) == 522859 && (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && (((uint64_t)(c))&0xffffffffL) == 0; + return ok; + } + ], [dnl + int ok = func( ((uint64_t)2000000000) * 1000000000, + ((uint64_t)1234567890) << 24); return !ok; ])], [tor_cv_can_use_curve25519_donna_c64=yes], [tor_cv_can_use_curve25519_donna_c64=no], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([dnl - #include <stdint.h> - typedef unsigned uint128_t __attribute__((mode(TI))); - ], [dnl - uint64_t a = ((uint64_t)2000000000) * 1000000000; - uint64_t b = ((uint64_t)1234567890) << 24; - uint128_t c = ((uint128_t)a) * b; - int ok = ((uint64_t)(c>>96)) == 522859 && - (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && - (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && - (((uint64_t)(c))&0xffffffffL) == 0; - return !ok; - ])], + #include <stdint.h> + typedef unsigned uint128_t __attribute__((mode(TI))); + int func(uint64_t a, uint64_t b) { + uint128_t c = ((uint128_t)a) * b; + int ok = ((uint64_t)(c>>96)) == 522859 && + (((uint64_t)(c>>64))&0xffffffffL) == 3604448702L && + (((uint64_t)(c>>32))&0xffffffffL) == 2351960064L && + (((uint64_t)(c))&0xffffffffL) == 0; + return ok; + } + ], [dnl + int ok = func( ((uint64_t)2000000000) * 1000000000, + ((uint64_t)1234567890) << 24); + return !ok; + ])], [tor_cv_can_use_curve25519_donna_c64=cross], [tor_cv_can_use_curve25519_donna_c64=no])])])

1 0

[tor/maint-0.2.4] Merge branch 'bug8587_v3' into maint-0.2.4
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit a1178cdbcf1f99715204567152635a57c705af0e Merge: d028c00 85e7de6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 18:12:44 2013 -0400 Merge branch 'bug8587_v3' into maint-0.2.4 changes/bug8587 | 5 +++++ configure.ac | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 18 deletions(-)

1 0