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

[tor-browser-bundle/master] Switch the install shortcut location to /Applications.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 23:31:00 2014 -0800 Switch the install shortcut location to /Applications. Mac users still get lost by a default install location to Desktop.. :/ In case we decide to do more extensive A/B testing: Keep skeletons for both Desktop and Application DMG templates around. --- Bundle-Data/mac-applications.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-applications.dmg/.VolumeIcon.icns | Bin 0 -> 242224 bytes Bundle-Data/mac-applications.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 | Bin 0 -> 173 bytes Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 + Bundle-Data/mac-applications.dmg/Applications | 1 + Bundle-Data/mac-desktop.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-desktop.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac-desktop.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-desktop.dmg/Desktop | Bin 0 -> 300120 bytes Bundle-Data/mac.dmg/.DS_Store | Bin 12292 -> 0 bytes Bundle-Data/mac.dmg/._Desktop | Bin 303592 -> 0 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 50020 -> 0 bytes Bundle-Data/mac.dmg/Desktop | Bin 300120 -> 0 bytes gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/mkbundle-mac.sh | 9 ++++++--- 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store new file mode 100644 index 0000000..aeb3104 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 new file mode 100644 index 0000000..e21068d Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid new file mode 100644 index 0000000..538367d --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid @@ -0,0 +1 @@ +B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications new file mode 120000 index 0000000..bd2d47f --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/Applications @@ -0,0 +1 @@ +/Applications \ No newline at end of file diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store deleted file mode 100644 index 9bec18c..0000000 Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop deleted file mode 100644 index a1e0b7f..0000000 Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop deleted file mode 100644 index 3c88450..0000000 Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 55a6777..4325a1b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -36,7 +36,8 @@ files: - "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" -- "mac-dmg.zip" +- "dmg-applications.tar.xz" +- "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" @@ -148,7 +149,7 @@ script: | make cd ../../ cd dmg - unzip ~/build/mac-dmg.zip + tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? cd .. # # FF24 puts the prefs in the browser jar: diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 18e0f8a..a9cbacb 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . -cd ../mac.dmg -rm -f $GITIAN_DIR/inputs/mac-dmg.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . +cd ../mac-desktop.dmg +rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz . +cd ../mac-applications.dmg +rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/master] Bug 4261: Make uncompressed DMG creation reproducible.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 82f061f118519c318ddf0aaa7dc4fcbd8290536e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:21:30 2014 -0800 Bug 4261: Make uncompressed DMG creation reproducible. genisoimage was non-deterministic, and libdmg was using unitialized memory in a stack struct. --- gitian/build-helpers/ddmg.sh | 25 +++++++------------ gitian/descriptors/mac/gitian-bundle.yml | 6 +++++ gitian/patches/libdmg.patch | 39 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index f9f54da..468d6be 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,24 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -# Attempt to normalize inode ordering.. -# XXX: the genisoimage -path-list argument seems broken -mkdir -p ~/build/tmp/dmg +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + cd $@ -for i in `find . | sort` -do - if [ -d $i ]; - then - mkdir -p ~/build/tmp/dmg/$i - else - cp --parents -d --preserve=all $i ~/build/tmp/dmg/ - fi -done +find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt +find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt + +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 -find ~/build/tmp/dmg -executable -exec chmod 700 {} \; -find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; +cd ~/build -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ ~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE rm tbb-uncompressed.dmg -rm -rf ~/build/tmp/dmg/ +rm ~/build/filelist.txt diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 63c0a96..55a6777 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "noscript(a)noscript.net.xpi" - "dzip.sh" - "ddmg.sh" +- "libdmg.patch" - "bare-version" - "bundle.inputs" - "versions" @@ -141,6 +142,7 @@ script: | # # Set up DMG skeleton cd libdmg-hfsplus + git am ~/build/libdmg.patch cmake CMakeLists.txt cd dmg make @@ -162,6 +164,10 @@ script: | ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app rm -rf ~/build/${TORBROWSER_NAME}_en-US.app else + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app diff --git a/gitian/patches/libdmg.patch b/gitian/patches/libdmg.patch new file mode 100644 index 0000000..a84ac3e --- /dev/null +++ b/gitian/patches/libdmg.patch @@ -0,0 +1,39 @@ +From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 6 Mar 2014 19:47:05 -0800 +Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. + +Some of the struct padding and fields contained unitialized memory, which +caused two successive invocations to produce archives that differed in some +bytes. +--- + dmg/dmglib.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dmg/dmglib.c b/dmg/dmglib.c +index f481b1f..b74e50b 100644 +--- a/dmg/dmglib.c ++++ b/dmg/dmglib.c +@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { + ChecksumToken dataForkToken; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + off_t plistOffset; + uint32_t plistSize; + uint32_t dataForkChecksum; +@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { + uint64_t numSectors; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + char partitionName[512]; + + off_t fileLength; +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bug #11069: Detect PT bootstrap failures.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit bfb553da6b2d1978c369361950079297a8628fbf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 17:05:04 2014 -0800 Bug #11069: Detect PT bootstrap failures. --- gitian/descriptors/linux/gitian-tor.yml | 4 + gitian/descriptors/mac/gitian-tor.yml | 4 + gitian/descriptors/windows/gitian-tor.yml | 4 + gitian/patches/bug11069.patch | 169 +++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index ce9372b..8a50ed4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -81,6 +82,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c2c2bf6..d2aab2f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,7 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -97,6 +98,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 6900a14..00b1f9a 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -93,6 +94,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch new file mode 100644 index 0000000..563aafb --- /dev/null +++ b/gitian/patches/bug11069.patch @@ -0,0 +1,169 @@ +From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Fri, 28 Feb 2014 15:19:30 +0000 +Subject: [PATCH] Throw control port warning if we failed connecting to briges. + +--- + changes/bug11069 | 4 ++++ + src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- + src/or/connection.h | 2 ++ + src/or/control.c | 7 ++++--- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 6 files changed, 42 insertions(+), 34 deletions(-) + create mode 100644 changes/bug11069 + +diff --git a/changes/bug11069 b/changes/bug11069 +new file mode 100644 +index 0000000..5aa3085 +--- /dev/null ++++ b/changes/bug11069 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes (clients): ++ - Fix tor so that it raises a control port warning when we fail to ++ connect to all of our bridges. Fixes bug 11069; bugfix on ++ tor-0.2.1.2-alpha. +diff --git a/src/or/connection.c b/src/or/connection.c +index 77565ee..12f2b01 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) + before = buf_datalen(conn->inbuf); + if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { + /* There's a read error; kill the connection.*/ +- if (conn->type == CONN_TYPE_OR) { +- connection_or_notify_error(TO_OR_CONN(conn), +- socket_error != 0 ? +- errno_to_orconn_end_reason(socket_error) : +- END_OR_CONN_REASON_CONNRESET, +- socket_error != 0 ? +- tor_socket_strerror(socket_error) : +- "(unknown, errno was 0)"); +- } + if (CONN_IS_EDGE(conn)) { + edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + connection_edge_end_errno(edge_conn); +@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); ++ ++ /* If it's an OR connection, notify the other components of its ++ failure. */ ++ if (conn->type == CONN_TYPE_OR) { ++ connection_or_notify_error(TO_OR_CONN(conn), ++ socket_error != 0 ? ++ errno_to_orconn_end_reason(socket_error) : ++ END_OR_CONN_REASON_CONNRESET, ++ socket_error != 0 ? ++ tor_socket_strerror(socket_error) : ++ "(unknown, errno was 0)"); ++ } ++ + return -1; + } + n_read += buf_datalen(conn->inbuf) - before; +@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, + return NULL; + } + ++/** Return 1 if there are any active OR connections. We use this to ++ * guess if we should tell the controller that we didn't manage to ++ * connect to any of our bridges. */ ++int ++any_active_or_conns(void) ++{ ++ smartlist_t *conns = get_connection_array(); ++ SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn->type == CONN_TYPE_OR && ++ !conn->marked_for_close) { ++ log_debug(LD_DIR, "%s: Found an OR connection: %s", ++ __func__, conn->address); ++ return 1; ++ } ++ } SMARTLIST_FOREACH_END(conn); ++ ++ return 0; ++} ++ + /** Return 1 if conn is a listener conn, else return 0. */ + int + connection_is_listener(connection_t *conn) +diff --git a/src/or/connection.h b/src/or/connection.h +index fa07650..47c70c5 100644 +--- a/src/or/connection.h ++++ b/src/or/connection.h +@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, + dir_connection_t *connection_dir_get_by_purpose_and_resource( + int state, const char *resource); + ++int any_active_or_conns(void); ++ + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) + int connection_is_listener(connection_t *conn); + int connection_state_is_open(connection_t *conn); +diff --git a/src/or/control.c b/src/or/control.c +index 05ff9a6..198fb18 100644 +--- a/src/or/control.c ++++ b/src/or/control.c +@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) + if (reason == END_OR_CONN_REASON_NO_ROUTE) + recommendation = "warn"; + +- if (get_options()->UseBridges && +- !any_bridge_descriptors_known() && +- !any_pending_bridge_descriptor_fetches()) ++ /* If we are using bridges and all our OR connections are now ++ closed, it means that we totally failed to connect to our ++ bridges. Throw a warning. */ ++ if (get_options()->UseBridges && !any_active_or_conns()) + recommendation = "warn"; + + if (we_are_hibernating()) +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index d463303..17c5b13 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) + return choose_random_entry(NULL) != NULL; + } + +-/** Return 1 if there are any directory conns fetching bridge descriptors +- * that aren't marked for close. We use this to guess if we should tell +- * the controller that we have a problem. */ +-int +-any_pending_bridge_descriptor_fetches(void) +-{ +- smartlist_t *conns = get_connection_array(); +- SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { +- if (conn->type == CONN_TYPE_DIR && +- conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && +- TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && +- !conn->marked_for_close && +- conn->linked && +- conn->linked_conn && !conn->linked_conn->marked_for_close) { +- log_debug(LD_DIR, "found one: %s", conn->address); +- return 1; +- } +- } SMARTLIST_FOREACH_END(conn); +- return 0; +-} +- + /** Return 1 if we have at least one descriptor for an entry guard + * (bridge or member of EntryNodes) and all descriptors we know are + * down. Else return 0. If act is 1, then mark the down guards +diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h +index 772c666..73ac017 100644 +--- a/src/or/entrynodes.h ++++ b/src/or/entrynodes.h +@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); + void fetch_bridge_descriptors(const or_options_t *options, time_t now); + void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); + int any_bridge_descriptors_known(void); +-int any_pending_bridge_descriptor_fetches(void); + int entries_known_but_down(const or_options_t *options); + void entries_retry_all(const or_options_t *options); + +-- +1.8.1.2 +

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit a6eae1dfddbe50e232b4bb52b2c0be2e8e7d8d14 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 04:45:57 2014 +0000 Update translations for tails-iuk_completed --- km.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/km.po b/km.po index 1144fbf..de16e6f 100644 --- a/km.po +++ b/km.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-02-21 17:38+0100\n" -"PO-Revision-Date: 2014-03-03 08:22+0000\n" +"POT-Creation-Date: 2014-03-05 15:11+0100\n" +"PO-Revision-Date: 2014-03-07 04:30+0000\n" "Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 -msgid "For debugging information, see ~/.xsession-errors." -msgstr "áááááâáááááá¶áâáážâáá¶áâááâááá á»á ááŒáâááŸá ~/.xsession-errors." +msgid "For debugging information, see /home/amnesia/.xsession-errors" +msgstr "áááááâáááááá¶áâááâááá á»á ááŒáâááŸá /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -99,7 +99,7 @@ msgstr "ááá á»áâáááâáááâááááŸáâáááá msgid "" "You should upgrade to %{name}s %{version}s.\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is recommended to close all the open applications during the upgrade.\n" "Downloading the upgrade might take a long time, from several minutes to a few hours.\n" @@ -108,7 +108,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "á¢áááâááœáâááááŸâááááá»áááááááá¶áâáá %{name}s %{version}s.\n\náááááâáááááá¶áâááááááâá¢ááážâááááâáááážâááá ááŒáâáá %{details_url}s á\n\náá¶âááááŒáâáá¶áâáááááâá¢áá»áá¶áááâá²ááâáá·áâáááááá·áážâáááâááŸáâáá¶ááâá¢ááâá¢áá¡á»áâáááâááááŸâááááá»áááááááá¶áá\náá¶áâáá¶áâááâááááá»áááááááá¶áââá¢á¶áâáááá¶áâáááâááŒá áážâáá¶áážâáááááááá\nááááá¶áâáá¹áâááááŒáâáá¶áâáá·áâááááá¶ááâáážââáá¶áâááâááááá»áááááááá¶áá\n\nááá áâáá¶áâááá %{size}s\n\nááŸâá¢ áááâáááâááááŸâá²ááâááááŸâááŸâá¡áŸáâá¥á¡áŒáâáááâá¬?" +msgstr "á¢áááâááœáâááááŸâááááá»áááááááá¶áâáá %{name}s %{version}s á\n\náááááâáááááá¶áâááááááâá¢ááážâááááâáááážâááá ááŒáâáá %{details_url}s\n\náá¶âááááŒáâáá¶áâáááááâá¢áá»áá¶áááâá²ááâáá·áâáááááá·áážâáá¶áâááŸáâáá¶ááá¢ááâá¢áá¡á»áâáááâááááŸâááááá»áááááááá¶áá\náá¶áâáá¶áâááâááááá»áááááááá¶áâá¢á¶áâáááá¶áâáááâááŒáâáážâáážáâáážâáá¶áážâáá áŒáâáááâáážáâáážâááááá\náá¶áâáâááááá¶áâáá¹áâááááŒáâáá¶áâááááááâááááá¶ááâáážâáá¶áâááâááááá»áááááá áá¶áá\n\nááá áâáá¶áâááá %{size}s\n\nááŸâá¢áááâáááâááááŸâááááá»ááááááâá¥á¡áŒáâá¬?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -127,12 +127,12 @@ msgstr "ááááŸâááááá»áááááááá¶áâáááá msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "á¢áááâááœáááâááááŸâá²ááâáááááŸáâá¡áŸáâáááâááâááááá %{name}s %{version}s á\n\nááááá¶ááâáááááá¶áâááááááâá¢ááážâááááâááááž, ááŒáâáááá¶áá %{details_url}s á\n\náá¶âáá·áâá¢á¶áâááááŸâá²ááâáááááŸáâá¡áŸáâáááâááááááááááááá·âá§áááááâááááâá¢áááâáááááâááááâáááážâáááá %{explanation}s á\nááŸáááážâááááááááâááááááâá¢ááážâáá¶áâááááŸâá²ááâáááááŸáâá¡áŸáâáááâáá, ááâáá¶áá https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "á¢áááâááœáâááâááááŸâááááá»áááááááá¶áâáááâááâáá %{name}s %{version}s á\n\náááááâáááááá¶áâááááááâá¢ááážâááááâáááážâáááâ ááŒáâáá %{details_url}s\n\náá¶âáá·áâá¢á¶áâááááŸâááááá»áááááááá¶áâáááâáááááâáááááááá·âá§áááááâááááâá¢áááâááâááááâáááážâáááá %{explanation}s á\n\nááŸáááážâááááááááâá¢ááážâáá·áážâááááŸâááááá»áááááááá¶áâáááâáá ááŒááá https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 00e4885f8c73b84544698eccfd60c1ef1d2edd83 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 04:45:52 2014 +0000 Update translations for tails-iuk --- km.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/km.po b/km.po index 78e1727..de16e6f 100644 --- a/km.po +++ b/km.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 04:30+0000\n" +"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 msgid "For debugging information, see /home/amnesia/.xsession-errors" -msgstr "" +msgstr "áááááâáááááá¶áâááâááá á»á ááŒáâááŸá /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -108,7 +108,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "á¢áááâááœáâááááŸâááááá»áááááááá¶áâáá %{name}s %{version}s á\n\náááááâáááááá¶áâááááááâá¢ááážâááááâáááážâááá ááŒáâáá %{details_url}s\n\náá¶âááááŒáâáá¶áâáááááâá¢áá»áá¶áááâá²ááâáá·áâáááááá·áážâáá¶áâááŸáâáá¶ááá¢ááâá¢áá¡á»áâáááâááááŸâááááá»áááááááá¶áá\náá¶áâáá¶áâááâááááá»áááááááá¶áâá¢á¶áâáááá¶áâáááâááŒáâáážâáážáâáážâáá¶áážâáá áŒáâáááâáážáâáážâááááá\náá¶áâáâááááá¶áâáá¹áâááááŒáâáá¶áâááááááâááááá¶ááâáážâáá¶áâááâááááá»áááááá áá¶áá\n\nááá áâáá¶áâááá %{size}s\n\nááŸâá¢áááâáááâááááŸâááááá»ááááááâá¥á¡áŒáâá¬?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -132,7 +132,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "á¢áááâááœáâááâááááŸâááááá»áááááááá¶áâáááâááâáá %{name}s %{version}s á\n\náááááâáááááá¶áâááááááâá¢ááážâááááâáááážâáááâ ááŒáâáá %{details_url}s\n\náá¶âáá·áâá¢á¶áâááááŸâááááá»áááááááá¶áâáááâáááááâáááááááá·âá§áááááâááááâá¢áááâááâááááâáááážâáááá %{explanation}s á\n\nááŸáááážâááááááááâá¢ááážâáá·áážâááááŸâááááá»áááááááá¶áâáááâáá ááŒááá https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit ed125b0f71e66bb1e0f177aacbebddf5f22606d1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 04:45:28 2014 +0000 Update translations for tails-greeter_completed --- km/km.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/km/km.po b/km/km.po index 5278267..cb71130 100644 --- a/km/km.po +++ b/km/km.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-21 19:40+0100\n" -"PO-Revision-Date: 2014-03-03 08:30+0000\n" +"POT-Creation-Date: 2014-03-04 11:11+0100\n" +"PO-Revision-Date: 2014-03-07 04:30+0000\n" "Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -116,8 +116,8 @@ msgid "MAC address spoofing" msgstr "បញ្ឆោតអាសយដ្ឋាន MAC" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/advanced_topics/mac_changer.en.html\">Help</a>" -msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">ជំនួយ</a>" +msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ជំនួយ</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -128,8 +128,8 @@ msgstr "ការបញ្ឆោតអាសយដ្ឋាន MAC លា #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " -"suspicion or cause network connection problems. See the documentation." -msgstr "ជាទូទៅវាកាន់តែមានសុវត្ថិភាពដើម្បីបញ្ឆោតអាសយដ្ឋាន MAC ប៉ុន្តែវាអាចបង្កើនការសង្ស័យ ឬធ្វើឲ្យការភ្ជាប់បណ្ដាញមានបញ្ហា។ សូមមើលឯកសារ។" +"suspicion or cause network connection problems." +msgstr "ជាទូទៅវាកាន់តែមានសុវត្ថិភាពដើម្បីបញ្ឆោតអាសយដ្ឋាន MAC ប៉ុន្តែវាក៏អាចបង្កើនការសង្ស័យ ឬធ្វើឲ្យការភ្ជាប់បណ្ដាញមានបញ្ហា។" #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 376364488ea0badf3c0b647d26f227c0a05bd789 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 04:45:21 2014 +0000 Update translations for tails-greeter --- km/km.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/km.po b/km/km.po index f25d813..cb71130 100644 --- a/km/km.po +++ b/km/km.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 04:30+0000\n" +"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -117,7 +117,7 @@ msgstr "បញ្ឆោតអាសយដ្ឋាន MAC" #: ../glade/optionswindow.glade.h:15 msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ជំនួយ</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -129,7 +129,7 @@ msgstr "ការបញ្ឆោតអាសយដ្ឋាន MAC លា msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "ជាទូទៅវាកាន់តែមានសុវត្ថិភាពដើម្បីបញ្ឆោតអាសយដ្ឋាន MAC ប៉ុន្តែវាក៏អាចបង្កើនការសង្ស័យ ឬធ្វើឲ្យការភ្ជាប់បណ្ដាញមានបញ្ហា។" #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

[tor/master] Upgrade to the latest version of tinytest.
by nickm＠torproject.org 06 Mar '14

06 Mar '14

commit 1365ff5b9a04a7da2acc2e52df18a61b6cb39fe6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 6 18:06:08 2014 -0500 Upgrade to the latest version of tinytest. This brings us to tinytest commit 709a36ba63ff16d8. The only big change tor-side is that we don't need our own test_mem_op operation any longer. --- changes/tinytest_upgrade | 2 + src/ext/tinytest.c | 150 ++++++++++++++++++++++++++++++++++++++------- src/ext/tinytest.h | 19 +++++- src/ext/tinytest_demo.c | 45 ++++++++++++++ src/ext/tinytest_macros.h | 10 +++ src/test/test.h | 17 +---- 6 files changed, 202 insertions(+), 41 deletions(-) diff --git a/changes/tinytest_upgrade b/changes/tinytest_upgrade new file mode 100644 index 0000000..ccac402 --- /dev/null +++ b/changes/tinytest_upgrade @@ -0,0 +1,2 @@ + o Testing: + - Update to the latest version of tinytest diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c index 4d9afac..3a8e331 100644 --- a/src/ext/tinytest.c +++ b/src/ext/tinytest.c @@ -31,6 +31,8 @@ #include <string.h> #include <assert.h> +#ifndef NO_FORKING + #ifdef _WIN32 #include <windows.h> #else @@ -39,6 +41,17 @@ #include <unistd.h> #endif +#if defined(__APPLE__) && defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) +#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 && \ + __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070) +/* Workaround for a stupid bug in OSX 10.6 */ +#define FORK_BREAKS_GCOV +#include <vproc.h> +#endif +#endif + +#endif /* !NO_FORKING */ + #ifndef __GNUC__ #define __attribute__(x) #endif @@ -58,6 +71,8 @@ static int opt_nofork = 0; /**< Suppress calls to fork() for debugging. */ static int opt_verbosity = 1; /**< -==quiet,0==terse,1==normal,2==verbose */ const char *verbosity_flag = ""; +const struct testlist_alias_t *cfg_aliases=NULL; + enum outcome { SKIP=2, OK=1, FAIL=0 }; static enum outcome cur_test_outcome = 0; const char *cur_test_prefix = NULL; /**< prefix of the current test group */ @@ -71,6 +86,7 @@ static char commandname[MAX_PATH+1]; static void usage(struct testgroup_t *groups, int list_groups) __attribute__((noreturn)); +static int process_test_option(struct testgroup_t *groups, const char *test); static enum outcome testcase_run_bare_(const struct testcase_t *testcase) @@ -99,6 +115,8 @@ testcase_run_bare_(const struct testcase_t *testcase) #define MAGIC_EXITCODE 42 +#ifndef NO_FORKING + static enum outcome testcase_run_forked_(const struct testgroup_t *group, const struct testcase_t *testcase) @@ -160,6 +178,9 @@ testcase_run_forked_(const struct testgroup_t *group, if (opt_verbosity>0) printf("[forking] "); pid = fork(); +#ifdef FORK_BREAKS_GCOV + vproc_transaction_begin(0); +#endif if (!pid) { /* child. */ int test_r, write_r; @@ -196,16 +217,19 @@ testcase_run_forked_(const struct testgroup_t *group, #endif } +#endif /* !NO_FORKING */ + int testcase_run_one(const struct testgroup_t *group, const struct testcase_t *testcase) { enum outcome outcome; - if (testcase->flags & TT_SKIP) { + if (testcase->flags & (TT_SKIP|TT_OFF_BY_DEFAULT)) { if (opt_verbosity>0) - printf("%s%s: SKIPPED\n", - group->prefix, testcase->name); + printf("%s%s: %s\n", + group->prefix, testcase->name, + (testcase->flags & TT_SKIP) ? "SKIPPED" : "DISABLED"); ++n_skipped; return SKIP; } @@ -218,9 +242,13 @@ testcase_run_one(const struct testgroup_t *group, cur_test_name = testcase->name; } +#ifndef NO_FORKING if ((testcase->flags & TT_FORK) && !(opt_forked||opt_nofork)) { outcome = testcase_run_forked_(group, testcase); } else { +#else + { +#endif outcome = testcase_run_bare_(testcase); } @@ -247,7 +275,7 @@ testcase_run_one(const struct testgroup_t *group, } int -tinytest_set_flag_(struct testgroup_t *groups, const char *arg, unsigned long flag) +tinytest_set_flag_(struct testgroup_t *groups, const char *arg, int set, unsigned long flag) { int i, j; size_t length = LONGEST_TEST_NAME; @@ -257,12 +285,23 @@ tinytest_set_flag_(struct testgroup_t *groups, const char *arg, unsigned long fl length = strstr(arg,"..")-arg; for (i=0; groups[i].prefix; ++i) { for (j=0; groups[i].cases[j].name; ++j) { + struct testcase_t *testcase = &groups[i].cases[j]; snprintf(fullname, sizeof(fullname), "%s%s", - groups[i].prefix, groups[i].cases[j].name); - if (!flag) /* Hack! */ - printf(" %s\n", fullname); + groups[i].prefix, testcase->name); + if (!flag) { /* Hack! */ + printf(" %s", fullname); + if (testcase->flags & TT_OFF_BY_DEFAULT) + puts(" (Off by default)"); + else if (testcase->flags & TT_SKIP) + puts(" (DISABLED)"); + else + puts(""); + } if (!strncmp(fullname, arg, length)) { - groups[i].cases[j].flags |= flag; + if (set) + testcase->flags |= flag; + else + testcase->flags &= ~flag; ++found; } } @@ -275,15 +314,69 @@ usage(struct testgroup_t *groups, int list_groups) { puts("Options are: [--verbose|--quiet|--terse] [--no-fork]"); puts(" Specify tests by name, or using a prefix ending with '..'"); - puts(" To skip a test, list give its name prefixed with a colon."); + puts(" To skip a test, prefix its name with a colon."); + puts(" To enable a disabled test, prefix its name with a plus."); puts(" Use --list-tests for a list of tests."); if (list_groups) { puts("Known tests are:"); - tinytest_set_flag_(groups, "..", 0); + tinytest_set_flag_(groups, "..", 1, 0); } exit(0); } +static int +process_test_alias(struct testgroup_t *groups, const char *test) +{ + int i, j, n, r; + for (i=0; cfg_aliases && cfg_aliases[i].name; ++i) { + if (!strcmp(cfg_aliases[i].name, test)) { + n = 0; + for (j = 0; cfg_aliases[i].tests[j]; ++j) { + r = process_test_option(groups, cfg_aliases[i].tests[j]); + if (r<0) + return -1; + n += r; + } + return n; + } + } + printf("No such test alias as @%s!",test); + return -1; +} + +static int +process_test_option(struct testgroup_t *groups, const char *test) +{ + int flag = TT_ENABLED_; + int n = 0; + if (test[0] == '@') { + return process_test_alias(groups, test + 1); + } else if (test[0] == ':') { + ++test; + flag = TT_SKIP; + } else if (test[0] == '+') { + ++test; + ++n; + if (!tinytest_set_flag_(groups, test, 0, TT_OFF_BY_DEFAULT)) { + printf("No such test as %s!\n", test); + return -1; + } + } else { + ++n; + } + if (!tinytest_set_flag_(groups, test, 1, flag)) { + printf("No such test as %s!\n", test); + return -1; + } + return n; +} + +void +tinytest_set_aliases(const struct testlist_alias_t *aliases) +{ + cfg_aliases = aliases; +} + int tinytest_main(int c, const char **v, struct testgroup_t *groups) { @@ -321,24 +414,18 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) return -1; } } else { - const char *test = v[i]; - int flag = TT_ENABLED_; - if (test[0] == ':') { - ++test; - flag = TT_SKIP; - } else { - ++n; - } - if (!tinytest_set_flag_(groups, test, flag)) { - printf("No such test as %s!\n", v[i]); + int r = process_test_option(groups, v[i]); + if (r<0) return -1; - } + n += r; } } if (!n) - tinytest_set_flag_(groups, "..", TT_ENABLED_); + tinytest_set_flag_(groups, "..", 1, TT_ENABLED_); +#ifdef _IONBF setvbuf(stdout, NULL, _IONBF, 0); +#endif ++in_tinytest_main; for (i=0; groups[i].prefix; ++i) @@ -385,3 +472,22 @@ tinytest_set_test_skipped_(void) cur_test_outcome = SKIP; } +char * +tinytest_format_hex_(const void *val_, unsigned long len) +{ + const unsigned char *val = val_; + char *result, *cp; + size_t i; + + if (!val) + return strdup("null"); + if (!(result = malloc(len*2+1))) + return strdup("<allocation failure>"); + cp = result; + for (i=0;i<len;++i) { + *cp++ = "0123456789ABCDEF"[val[i] >> 4]; + *cp++ = "0123456789ABCDEF"[val[i] & 0x0f]; + } + *cp = 0; + return result; +} diff --git a/src/ext/tinytest.h b/src/ext/tinytest.h index bcac9f0..ed07b26 100644 --- a/src/ext/tinytest.h +++ b/src/ext/tinytest.h @@ -32,8 +32,10 @@ #define TT_SKIP (1<<1) /** Internal runtime flag for a test we've decided to run. */ #define TT_ENABLED_ (1<<2) +/** Flag for a test that's off by default. */ +#define TT_OFF_BY_DEFAULT (1<<3) /** If you add your own flags, make them start at this point. */ -#define TT_FIRST_USER_FLAG (1<<3) +#define TT_FIRST_USER_FLAG (1<<4) typedef void (*testcase_fn)(void *); @@ -64,6 +66,12 @@ struct testgroup_t { }; #define END_OF_GROUPS { NULL, NULL} +struct testlist_alias_t { + const char *name; + const char **tests; +}; +#define END_OF_ALIASES { NULL, NULL } + /** Implementation: called from a test to indicate failure, before logging. */ void tinytest_set_test_failed_(void); /** Implementation: called from a test to indicate that we're skipping. */ @@ -72,14 +80,19 @@ void tinytest_set_test_skipped_(void); int tinytest_get_verbosity_(void); /** Implementation: Set a flag on tests matching a name; returns number * of tests that matched. */ -int tinytest_set_flag_(struct testgroup_t *, const char *, unsigned long); +int tinytest_set_flag_(struct testgroup_t *, const char *, int set, unsigned long); +/** Implementation: Put a chunk of memory into hex. */ +char *tinytest_format_hex_(const void *, unsigned long); /** Set all tests in 'groups' matching the name 'named' to be skipped. */ #define tinytest_skip(groups, named) \ - tinytest_set_flag_(groups, named, TT_SKIP) + tinytest_set_flag_(groups, named, 1, TT_SKIP) /** Run a single testcase in a single group. */ int testcase_run_one(const struct testgroup_t *,const struct testcase_t *); + +void tinytest_set_aliases(const struct testlist_alias_t *aliases); + /** Run a set of testcases from an END_OF_GROUPS-terminated array of groups, as selected from the command line. */ int tinytest_main(int argc, const char **argv, struct testgroup_t *groups); diff --git a/src/ext/tinytest_demo.c b/src/ext/tinytest_demo.c index be95ce4..bdd0e60 100644 --- a/src/ext/tinytest_demo.c +++ b/src/ext/tinytest_demo.c @@ -35,6 +35,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <time.h> +#ifndef _WIN32 +#include <unistd.h> +#endif /* ============================================================ */ @@ -148,6 +152,9 @@ test_memcpy(void *ptr) memcpy(db->buffer2, db->buffer1, sizeof(db->buffer1)); tt_str_op(db->buffer1, ==, db->buffer2); + /* This one works if there's an internal NUL. */ + tt_mem_op(db->buffer1, <, db->buffer2, sizeof(db->buffer1)); + /* Now we've allocated memory that's referenced by a local variable. The end block of the function will clean it up. */ mem = strdup("Hello world."); @@ -162,6 +169,27 @@ test_memcpy(void *ptr) free(mem); } +void +test_timeout(void *ptr) +{ + time_t t1, t2; + (void)ptr; + t1 = time(NULL); +#ifdef _WIN32 + Sleep(5000); +#else + sleep(5); +#endif + t2 = time(NULL); + + tt_int_op(t2-t1, >=, 4); + + tt_int_op(t2-t1, <=, 6); + + end: + ; +} + /* ============================================================ */ /* Now we need to make sure that our tests get invoked. First, you take @@ -178,6 +206,10 @@ struct testcase_t demo_tests[] = { its environment. */ { "memcpy", test_memcpy, TT_FORK, &data_buffer_setup }, + /* This flag is off-by-default, since it takes a while to run. You + * can enable it manually by passing +demo/timeout at the command line.*/ + { "timeout", test_timeout, TT_OFF_BY_DEFAULT }, + /* The array has to end with END_OF_TESTCASES. */ END_OF_TESTCASES }; @@ -192,6 +224,18 @@ struct testgroup_t groups[] = { END_OF_GROUPS }; +/* We can also define test aliases. These can be used for types of tests that + * cut across groups. */ +const char *alltests[] = { "+..", NULL }; +const char *slowtests[] = { "+demo/timeout", NULL }; +struct testlist_alias_t aliases[] = { + + { "ALL", alltests }, + { "SLOW", slowtests }, + + END_OF_ALIASES +}; + int main(int c, const char **v) @@ -211,5 +255,6 @@ main(int c, const char **v) "tinytest-demo" and "tinytest-demo .." mean the same thing. */ + tinytest_set_aliases(aliases); return tinytest_main(c, v, groups); } diff --git a/src/ext/tinytest_macros.h b/src/ext/tinytest_macros.h index 5bb8f8e..db2dfcb 100644 --- a/src/ext/tinytest_macros.h +++ b/src/ext/tinytest_macros.h @@ -171,6 +171,16 @@ (val1_ && val2_ && strcmp(val1_,val2_) op 0),"<%s>", \ TT_EXIT_TEST_FUNCTION) +#define tt_mem_op(expr1, op, expr2, len) \ + tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \ + const char *, \ + (val1_ && val2_ && memcmp(val1_, val2_, len) op 0), \ + char *, "%s", \ + { print_ = tinytest_format_hex_(value_, (len)); }, \ + { if (print_) free(print_); }, \ + TT_EXIT_TEST_FUNCTION \ + ); + #define tt_want_int_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0) diff --git a/src/test/test.h b/src/test/test.h index b902c6e..ba82f52 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -36,22 +36,7 @@ #define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2)) #define test_mem_op(expr1, op, expr2, len) \ - tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \ - const char *, \ - (val1_ && val2_ && memcmp(val1_, val2_, len) op 0), \ - char *, "%s", \ - { size_t printlen = (len)*2+1; \ - if (value_) { \ - print_ = tor_malloc(printlen); \ - base16_encode(print_, printlen, value_, \ - (len)); \ - } else { \ - print_ = tor_strdup("null"); \ - } \ - }, \ - { tor_free(print_); }, \ - TT_EXIT_TEST_FUNCTION \ - ); + tt_mem_op((expr1), op, (expr2), (len)) #define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len) #define test_memneq(expr1, expr2, len) test_mem_op((expr1), !=, (expr2), len)

1 0

[bridgedb/develop] Rewrite GSoC 2014 volunteer page text with Damian's suggestions.
by isis＠torproject.org 06 Mar '14

06 Mar '14

commit d5f25637e07d3df5a31da817e0fca1120f0e82ba Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 6 21:33:55 2014 +0000 Rewrite GSoC 2014 volunteer page text with Damian's suggestions. --- doc/gsoc2014-volunteer.txt | 117 ++++++++++---------------------------------- 1 file changed, 26 insertions(+), 91 deletions(-) diff --git a/doc/gsoc2014-volunteer.txt b/doc/gsoc2014-volunteer.txt index eb93611..1cedaf9 100644 --- a/doc/gsoc2014-volunteer.txt +++ b/doc/gsoc2014-volunteer.txt @@ -1,92 +1,27 @@ -Volunteer Posting ------------------ - -Number of Positions Available: 2 - -Project: BridgeDB https://gitweb.torproject.org/bridgedb.git - -Difficulty Level: Moderate - Difficult, dependent on proposal and previous experience - -Myself (isis) and sysrqb are both looking for students who wish to help Tor by -contributing code to BridgeDB (the program which distributes Tor bridges and -pluggable transport bridges to clients connecting to Tor) through -participation in Google Summer of Code 2014. We are each taking a student, so -if we each find someone someone we want to mentor, then we'll take two -students total. If we only find one student we like, then I suppose sysrqb and -I will just have to fight over that person. - -Required Skills and Prerequisite Tasks for Application: -------------------------------------------------------- - * IRC skills. Lurk in irc.oftc.net#tor-dev, and possibly irc.freenode.net#gsoc as well. - - * Fluent in Python (version 2.7). - - * Proven experience and comfort with asynchronous network programming using - Twisted. - - * Be comfortable doing git things. Not saying you have to have mad - git-fu, but we shouldn't have to explain the difference between - merge/rebase or fetch/pull. - - * Familiarity with documentating code in Sphinx ReStructured Text - format. (See recent commits in the BridgeDB repository for syntax - examples, and https://para.noid.cat/bridgedb/ for documentation builds.) - - * Familiarity with writing unittests. (And willingness to do so!) - Preferably, using `twisted.trial.unittest.TestCase`s. See - https://coveralls.io/r/isislovecruft/bridgedb for current test coverage. - - * Submit a brief sample of Python code that you're proud of (written by you, - and for which you've got whatever necessary legal whatever is needed for - you to share it). It helps if it's Twisted Python code, but it doesn't - have to be. - - * Fix a BridgeDB ticket. Contact isis or sysrqb on ircs://irc.oftc.net:6697 - in #tor-dev to ask if a particular ticket is a good idea, or to ask for a - suggestion or help. Eventually, sysrqb and I will tag some tickets with - "bridgedb-gsoc-application" that we think are good ones to try. - - * Submit a proposal for a distributor (an object which distributes Tor - bridges to clients in possibly censored/surveilled regions). Current - distributors include the `bridgedb.Dist.EmailBasedDistributor` at - bridges(a)bridges.torproject.org, and the `bridgedb.Dist.IPBasedDistributor` - which serves pages at https://bridges.torproject.org . Other example ideas - for bridge distributors are: - - A Twitter bot which interacts with Chinese and Farsi speaking - Twitter users through PMs. - - A distributor which uses XMPP+OTR to give bridges to users. - - Basically, all the nifty protocol obfuscation tricks which could - apply to a pluggable transport would likely also apply here. - - Keep in mind that various adversaries (automated and/or human and/or - extraterrestrial and/or unknown) will be trying to trick your - distributor into giving them bridges. Be prepared to come up with - some sort of safety machanism(s) to protect against this. - - You should plan to have your code finished, reviewed (and - revised…), tested, approved, and deployed by the end of GSoC. (I - think this means "at the end of six weeks".) - - * Please send your code sample, a link to your completed BridgeDB ticket - (which should have your patch(es) attached, or have a link to your git - repository), and proposal to both isis(a)torproject.org and - sysrqb(a)torproject.org. Additionally CC'ing tor-dev(a)lists.torproject.org is - probably a good idea. - - * If accepted, you'll need a google-melange account: - https://www.google-melange.com/gsoc/homepage/google/gsoc2014?ModPagespeed=n… - -Additional Ways to Earn Bonus Points: -------------------------------------- - * OTR skills (over IRC/XMPP). - - * Knowledge about the current state and technical mechanisms of real-world, - deployed censorship/surveillance systems is helpful, though not necessary. - We will gladly provide continual feedback on design proposals and - implementation to ensure that the threats posed by various adversaries - have been taken into account. - - * Major bonus points if you're into test-driven development. - - * Propose building more than one distributor. Each of them still needs to be - a good idea, and we'll need to make certain it's something you're capable - of finishing in the allotted timespan. +New BridgeDB Distributor +------------------------ + +Effort Level: Medium +Skill Level: Medium to Medium-High +Likely Mentors: isis, sysrqb + +BridgeDB is a Twisted Python system which runs a number of servers, in order +to distribute Tor bridge relays to users in potentially censored regions. Each +of BridgeDB's Distributors uses some unique channel to communicate bridge +addresses to users, currently there is an [https://bridges.torproject.org +HTTPS Distributor], and an Email Distributor. This project would involve +designing and creating a new Distributor for BridgeDB. Some ideas for new +Distributors: + + - A Twitter bot which interacts with Chinese and Farsi speaking + Twitter users through PMs. + - A distributor which uses XMPP+OTR to give bridges to users. + +It's helpful if you already have some knowledge of Twisted. As part of your +application, please submit a design for a Distributor, as well as supply a +patch for a ticket which demonstrates knowledge of Twisted and Python ― +preferably for BridgeDB, see the +[https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~bridgedb-gsoc-application +'bridgedb-gsoc-application'] Trac tag for some examples of good tickets to +try, or contact isis or sysrqb on IRC to ask for ticket suggestions or advice.

1 0

[bridgedb/develop] Merge branch 'fix/update-gsoc-text' into develop
by isis＠torproject.org 06 Mar '14

06 Mar '14

commit fff100491206a0bc943c22e5876b0561f9b7ba57 Merge: a41cf0d d5f2563 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 6 21:41:05 2014 +0000 Merge branch 'fix/update-gsoc-text' into develop doc/gsoc2014-volunteer.txt | 117 ++++++++++---------------------------------- 1 file changed, 26 insertions(+), 91 deletions(-)

1 0