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

[tor-browser-bundle/master] Bug 16224: No need to set BUILD_HOSTNAME anymore
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit aa737d315bab537d94a14d7f2dca16d7b54edc38 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 08:58:05 2016 +0000 Bug 16224: No need to set BUILD_HOSTNAME anymore Mozilla got rid of exposing the hostname of the machine that built Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1168316. We therefore don't need to set it anymore to avoid reproducibility issues. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b206bf5..22dcbd4 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -115,7 +115,7 @@ script: | export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. export LD_PRELOAD="" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 601a095..17c4c8b 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -76,7 +76,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,rsync,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 7358922..2686c5f 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -100,7 +100,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 20 Apr '16

20 Apr '16

commit 335632457f28b1d5f789fa2ca2fc6aa429ec8502 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 03:15:52 2016 +0000 Update translations for tor-launcher-network-settings_completed --- zh_HK/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd index 2bd62e6..2967069 100644 --- a/zh_HK/network-settings.dtd +++ b/zh_HK/network-settings.dtd @@ -72,4 +72,4 @@ <!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使網絡攻擊者更難取得橋接器位址，你必須使用以下電郵提供者之一嚟寄送呢個要求(順序係依照優先建議)："> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> -<!ENTITY torsettings.bridgeHelp4 "最後方法係：發送一封郵件到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> +<!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 20 Apr '16

20 Apr '16

commit a9343fd9681967934bd23420749f1d06cff914e5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 03:15:48 2016 +0000 Update translations for tor-launcher-network-settings --- zh_HK/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd index 2bd62e6..2967069 100644 --- a/zh_HK/network-settings.dtd +++ b/zh_HK/network-settings.dtd @@ -72,4 +72,4 @@ <!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使網絡攻擊者更難取得橋接器位址，你必須使用以下電郵提供者之一嚟寄送呢個要求(順序係依照優先建議)："> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> -<!ENTITY torsettings.bridgeHelp4 "最後方法係：發送一封郵件到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> +<!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。">

1 0

[translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed
by translation＠torproject.org 20 Apr '16

20 Apr '16

commit c2248659c45278219c0acbc27be19916076f8c69 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 02:17:02 2016 +0000 Update translations for tor-messenger-otrproperties_completed --- zh_HK/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/otr.properties b/zh_HK/otr.properties index ec94b23..0f10807 100644 --- a/zh_HK/otr.properties +++ b/zh_HK/otr.properties @@ -4,12 +4,12 @@ msgevent.encryption_error=加密訊息時發生錯誤。未成功傳送訊息。 msgevent.connection_ended=%S已關閉與你嘅私人通訊。你嘅訊息未成功傳送。請終止私人通訊，或重新開始。 msgevent.setup_error=建立與%S嘅私人對話時發生錯誤。 msgevent.msg_reflected=你收到咗自己嘅唔記錄訊息。你一係嘗試同自己聊天，一係某人將你嘅訊息傳回畀你。 -msgevent.msg_resent=傳送畀%S嘅上一個訊息已重發。 +msgevent.msg_resent=寄畀%S嘅上一個訊息已重發。 msgevent.rcvdmsg_not_private=嚟自%S嘅加密訊息無法閱讀，因為目前並非私人通訊。 msgevent.rcvdmsg_unreadable=收到嚟自%S嘅加密訊息無法閱讀。 msgevent.rcvdmsg_malformed=收到來自%S嘅訊息格式有誤。 msgevent.log_heartbeat_rcvd=嚟自%S嘅心跳(Heartbeat)。 -msgevent.log_heartbeat_sent=傳送畀%S嘅心跳(Heartbeat)。 +msgevent.log_heartbeat_sent=寄畀%S嘅心跳(Heartbeat)。 msgevent.rcvdmsg_general_err=發生唔記錄錯誤。 msgevent.rcvdmsg_unecrypted=以下嚟自%S嘅訊息未加密：%S msgevent.rcvdmsg_unrecognized=我哋由%S收到一個未能識別嘅唔記錄訊息。

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 20 Apr '16

20 Apr '16

commit 8731f9b95416c67be39c12a8709d53cb05c1ecb1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 02:16:59 2016 +0000 Update translations for tor-messenger-otrproperties --- zh_HK/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/otr.properties b/zh_HK/otr.properties index ec94b23..0f10807 100644 --- a/zh_HK/otr.properties +++ b/zh_HK/otr.properties @@ -4,12 +4,12 @@ msgevent.encryption_error=加密訊息時發生錯誤。未成功傳送訊息。 msgevent.connection_ended=%S已關閉與你嘅私人通訊。你嘅訊息未成功傳送。請終止私人通訊，或重新開始。 msgevent.setup_error=建立與%S嘅私人對話時發生錯誤。 msgevent.msg_reflected=你收到咗自己嘅唔記錄訊息。你一係嘗試同自己聊天，一係某人將你嘅訊息傳回畀你。 -msgevent.msg_resent=傳送畀%S嘅上一個訊息已重發。 +msgevent.msg_resent=寄畀%S嘅上一個訊息已重發。 msgevent.rcvdmsg_not_private=嚟自%S嘅加密訊息無法閱讀，因為目前並非私人通訊。 msgevent.rcvdmsg_unreadable=收到嚟自%S嘅加密訊息無法閱讀。 msgevent.rcvdmsg_malformed=收到來自%S嘅訊息格式有誤。 msgevent.log_heartbeat_rcvd=嚟自%S嘅心跳(Heartbeat)。 -msgevent.log_heartbeat_sent=傳送畀%S嘅心跳(Heartbeat)。 +msgevent.log_heartbeat_sent=寄畀%S嘅心跳(Heartbeat)。 msgevent.rcvdmsg_general_err=發生唔記錄錯誤。 msgevent.rcvdmsg_unecrypted=以下嚟自%S嘅訊息未加密：%S msgevent.rcvdmsg_unrecognized=我哋由%S收到一個未能識別嘅唔記錄訊息。

1 0

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

20 Apr '16

commit 025c3ecc37c1acffdf27d53546f0582e7708f3c0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 20 02:16:04 2016 +0000 Update translations for torbutton-torbuttonproperties --- zh_HK/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torbutton.properties b/zh_HK/torbutton.properties index cdadcb5..35ee82a 100644 --- a/zh_HK/torbutton.properties +++ b/zh_HK/torbutton.properties @@ -49,7 +49,7 @@ torbutton.popup.pref_error = Torbutton無法更新洋蔥路由瀏覽器設定檔 torbutton.popup.permission_denied = 請重新設定Tor洋蔥路由瀏覽器目錄嘅使用權限，或將其複製到新嘅位置。 torbutton.popup.device_full = 磁碟空間可能已滿。請釋放空間或將Tor洋蔥路由瀏覽器移至新嘅裝置。 torbutton.title.prompt_torbrowser = 重要嘅Torbutton資訊 -torbutton.popup.prompt_torbrowser = Torbutton咿㗎以唔同嘅方式運作：你再唔能夠將其關閉。\n\n我哋做咁樣嘅更改，因為若喺同一個瀏覽器中，使用Tor洋蔥路由到訪網站，又同時不經過洋蔥路由到訪其他網站，將會有安全上嘅疑慮。目前仍有太多我們無法修復嘅程式錯誤存在。\n\n如果你希望繼續正常使用Firefox，你應解除安裝Torbutton並下載Tor洋蔥路由瀏覽器套件。Tor洋蔥路由瀏覽器嘅私隱度也高於普通嘅Firefox，即使當Firefox同Torbutton一起使用時都係。\n\n要移除Torbutton，請前往「工具→附加元件→擴充套件」然後撳「Torbutton」旁嘅〔移除〕按鈕。 +torbutton.popup.prompt_torbrowser = Torbutton咿㗎以唔同嘅方式運作：你再唔能夠將佢關閉。\n\n我哋做咁樣嘅更改，係因為喺同一個瀏覽器中，使用Tor洋蔥路由到訪網站，又同時唔經過洋蔥路由到訪其他網站，將唔安全。目前仍有太多我哋無法修復嘅程式錯誤存在。\n\n如果你希望繼續正常使用Firefox，你應解除安裝Torbutton並下載Tor洋蔥路由瀏覽器套件。即使Firefox同Torbutton一齊使用，Tor洋蔥路由瀏覽器嘅私隱度都仍然係高於普通嘅Firefox。\n\n要移除Torbutton，請前往「工具→附加元件→擴充套件」然後撳「Torbutton」旁嘅〔移除〕按鈕。 torbutton.popup.short_torbrowser = 重要嘅Torbutton資訊！\n\nTorbutton咿㗎永遠啟用。\n\n撳Torbutton取得更多資訊。 torbutton.popup.confirm_plugins = 諸如Flash嘅瀏覽器外掛程式可能會危害你嘅私隱同匿名度。\n\n佢哋可繞過Tor洋蔥路由，透露出你所在嘅位置同IP位址。\n\n確定要啟用外掛式嗎？\n\n

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 4570176bfb4ae320c2a9abb3b54427bc0b3f85af Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 19:16:47 2016 +0000 Update translations for tails-onioncircuits --- hu/onioncircuits.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index cceb475..ac5fd4d 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # benewfy <benewfy(a)gmail.com>, 2016 +# Faludi Zoltán, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-04-12 02:36+0000\n" -"Last-Translator: benewfy <benewfy(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-19 18:55+0000\n" +"Last-Translator: Faludi Zoltán\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "Állapot" #: ../onioncircuits:141 msgid "Click on a path to get details" -msgstr "" +msgstr "A részletekhez kattints az útvonalra" #: ../onioncircuits:215 msgid "" @@ -71,7 +72,7 @@ msgstr "Ujjlenyomat:" #: ../onioncircuits:565 msgid "Published:" -msgstr "" +msgstr "Közzétéve:" #: ../onioncircuits:566 msgid "IP:"

1 0

[tor/master] Basic 'handle' implementation and tests.
by nickm＠torproject.org 19 Apr '16

19 Apr '16

commit e015f7c9ccbbb6d857e23ff419528729e44fff93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 11 18:34:29 2016 -0500 Basic 'handle' implementation and tests. This abstraction covers the case where one part of the program needs to refer to another object that is allowed to disappear. --- src/common/handles.h | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + src/test/include.am | 1 + src/test/test.c | 2 + src/test/test.h | 2 +- src/test/test_handles.c | 95 ++++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 1 deletion(-) diff --git a/src/common/handles.h b/src/common/handles.h new file mode 100644 index 0000000..1ee2322 --- /dev/null +++ b/src/common/handles.h @@ -0,0 +1,153 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file handles.h + * \brief Macros for C weak-handle implementation. + * + * A 'handle' is a pointer to an object that is allowed to go away while + * the handle stays alive. When you dereference the handle, you might get + * the object, or you might get "NULL". + * + * Use this pattern when an object has a single obvious lifespan, so you don't + * want to use reference counting, but when other objects might need to refer + * to the first object without caring about its lifetime. + * + * To enable a type to have handles, add a HANDLE_ENTRY() field in its + * definition, as in: + * + * struct walrus { + * HANDLE_ENTRY(wlr, walrus); + * // ... + * }; + * + * And invoke HANDLE_DECL(wlr, walrus, [static]) to declare the handle + * manipulation functions (typically in a header): + * + * // opaque handle to walrus. + * typedef struct wlr_handle_t wlr_handle_t; + * + * // make a new handle + * struct wlr_handle_t *wlr_handle_new(struct walrus *); + * + * // release a handle + * void wlr_handle_free(wlr_handle_t *); + * + * // return the pointed-to walrus, or NULL. + * struct walrus *wlr_handle_get(wlr_handle_t *). + * + * // call this function when you're about to free the walrus; + * // it invalidates all handles. (IF YOU DON'T, YOU WILL HAVE + * // DANGLING REFERENCES) + * void wlr_handles_clear(struct walrus *); + * + * Finally, use HANDLE_IMPL() to define the above functions in some + * appropriate C file: HANDLE_IMPL(wlr, walrus, [static]) + * + **/ + +#ifndef TOR_HANDLE_H +#define TOR_HANDLE_H + +#include "orconfig.h" +#include "tor_queue.h" +#include "util.h" + +#define HANDLE_ENTRY(name, structname) \ + struct name ## _handle_head_t *handle_head + +#define HANDLE_DECL(name, structname, linkage) \ + typedef struct name ## _handle_t name ## _handle_t; \ + linkage name ## _handle_t *name ## _handle_new(struct structname *object); \ + linkage void name ## _handle_free(name ## _handle_t *); \ + linkage struct structname *name ## _handle_get(name ## _handle_t *); \ + linkage void name ## _handles_clear(struct structname *object); + +/* + * Implementation notes: there are lots of possible implementations here. We + * could keep a linked list of handles, each with a backpointer to the object, + * and set all of their backpointers to NULL when the object is freed. Or we + * could have the clear function invalidate the object, but not actually let + * the object get freed until the all the handles went away. We could even + * have a hash-table mapping unique identifiers to objects, and have each + * handle be a copy of the unique identifier. (We'll want to build that last + * one eventually if we want cross-process handles.) + * + * But instead we're opting for a single independent 'head' that knows how + * many handles there are, and where the object is (or isn't). This makes + * all of our functions O(1), and most as fast as a single pointer access. + * + * The handles themselves are opaque structures holding a pointer to the head. + * We could instead have each foo_handle_t* be identical to foo_handle_head_t + * *, and save some allocations ... but doing so would make handle leaks + * harder to debug. As it stands, every handle leak is a memory leak, and + * existing memory debugging tools should help with those. We can revisit + * this decision if handles are too slow. + */ + +#define HANDLE_IMPL(name, structname, linkage) \ + /* The 'head' object for a handle-accessible type. This object */ \ + /* persists for as long as the object, or any handles, exist. */ \ + typedef struct name ## _handle_head_t { \ + struct structname *object; /* pointed-to object, or NULL */ \ + unsigned int references; /* number of existing handles */ \ + } name ## _handle_head_t; \ + \ + struct name ## _handle_t { \ + struct name ## _handle_head_t *head; /* reference to the 'head'. */ \ + }; \ + \ + linkage struct name ## _handle_t * \ + name ## _handle_new(struct structname *object) \ + { \ + tor_assert(object); \ + name ## _handle_head_t *head = object->handle_head; \ + if (PREDICT_UNLIKELY(head == NULL)) { \ + head = object->handle_head = tor_malloc_zero(sizeof(*head)); \ + head->object = object; \ + } \ + name ## _handle_t *new_ref = tor_malloc_zero(sizeof(*new_ref)); \ + new_ref->head = head; \ + ++head->references; \ + return new_ref; \ + } \ + \ + linkage void \ + name ## _handle_free(struct name ## _handle_t *ref) \ + { \ + if (! ref) return; \ + name ## _handle_head_t *head = ref->head; \ + tor_assert(head); \ + --head->references; \ + tor_free(ref); \ + if (head->object == NULL && head->references == 0) { \ + tor_free(head); \ + return; \ + } \ + } \ + \ + linkage struct structname * \ + name ## _handle_get(struct name ## _handle_t *ref) \ + { \ + tor_assert(ref); \ + name ## _handle_head_t *head = ref->head; \ + tor_assert(head); \ + return head->object; \ + } \ + \ + linkage void \ + name ## _handles_clear(struct structname *object) \ + { \ + tor_assert(object); \ + name ## _handle_head_t *head = object->handle_head; \ + if (! head) \ + return; \ + object->handle_head = NULL; \ + head->object = NULL; \ + if (head->references == 0) { \ + tor_free(head); \ + } \ + } + +#endif /* TOR_HANDLE_H */ + diff --git a/src/common/include.am b/src/common/include.am index 5afb30d..04994c7 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -129,6 +129,7 @@ COMMONHEADERS = \ src/common/crypto_pwbox.h \ src/common/crypto_s2k.h \ src/common/di_ops.h \ + src/common/handles.h \ src/common/memarea.h \ src/common/linux_syscalls.inc \ src/common/procmon.h \ diff --git a/src/test/include.am b/src/test/include.am index 7d80fdf..a3543dd 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -86,6 +86,7 @@ src_test_test_SOURCES = \ src/test/test_guardfraction.c \ src/test/test_extorport.c \ src/test/test_hs.c \ + src/test/test_handles.c \ src/test/test_introduce.c \ src/test/test_keypin.c \ src/test/test_link_handshake.c \ diff --git a/src/test/test.c b/src/test/test.c index ed167a3..3519dca 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1177,6 +1177,7 @@ extern struct testcase_t util_tests[]; extern struct testcase_t util_format_tests[]; extern struct testcase_t util_process_tests[]; extern struct testcase_t dns_tests[]; +extern struct testcase_t handle_tests[]; struct testgroup_t testgroups[] = { { "", test_array }, @@ -1231,6 +1232,7 @@ struct testgroup_t testgroups[] = { { "util/logging/", logging_tests }, { "util/process/", util_process_tests }, { "util/thread/", thread_tests }, + { "util/handle/", handle_tests }, { "dns/", dns_tests }, END_OF_GROUPS }; diff --git a/src/test/test.h b/src/test/test.h index e618ce1..153b7ca 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -73,7 +73,7 @@ {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION) const char *get_fname(const char *name); -crypto_pk_t *pk_generate(int idx); +struct crypto_pk_t *pk_generate(int idx); #define US2_CONCAT_2__(a, b) a ## __ ## b #define US_CONCAT_2__(a, b) a ## _ ## b diff --git a/src/test/test_handles.c b/src/test/test_handles.c new file mode 100644 index 0000000..8aaae13 --- /dev/null +++ b/src/test/test_handles.c @@ -0,0 +1,95 @@ +/* Copyright (c) 2016, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "test.h" + +#include "util.h" +#include "handles.h" + +typedef struct demo_t { + HANDLE_ENTRY(demo, demo_t); + int val; +} demo_t; + +HANDLE_DECL(demo, demo_t, static); +HANDLE_IMPL(demo, demo_t, static); + +static demo_t * +demo_new(int val) +{ + demo_t *d = tor_malloc_zero(sizeof(demo_t)); + d->val = val; + return d; +} + +static void +demo_free(demo_t *d) +{ + if (d == NULL) + return; + demo_handles_clear(d); + tor_free(d); +} + +static void +test_handle_basic(void *arg) +{ + (void) arg; + demo_t *d1 = NULL, *d2 = NULL; + demo_handle_t *wr1 = NULL, *wr2 = NULL, *wr3 = NULL, *wr4 = NULL; + + d1 = demo_new(9000); + d2 = demo_new(9009); + + wr1 = demo_handle_new(d1); + wr2 = demo_handle_new(d1); + wr3 = demo_handle_new(d1); + wr4 = demo_handle_new(d2); + + tt_assert(wr1); + tt_assert(wr2); + tt_assert(wr3); + tt_assert(wr4); + + tt_ptr_op(demo_handle_get(wr1), OP_EQ, d1); + tt_ptr_op(demo_handle_get(wr2), OP_EQ, d1); + tt_ptr_op(demo_handle_get(wr3), OP_EQ, d1); + tt_ptr_op(demo_handle_get(wr4), OP_EQ, d2); + + demo_handle_free(wr1); + wr1 = NULL; + tt_ptr_op(demo_handle_get(wr2), OP_EQ, d1); + tt_ptr_op(demo_handle_get(wr3), OP_EQ, d1); + tt_ptr_op(demo_handle_get(wr4), OP_EQ, d2); + + demo_free(d1); + d1 = NULL; + tt_ptr_op(demo_handle_get(wr2), OP_EQ, NULL); + tt_ptr_op(demo_handle_get(wr3), OP_EQ, NULL); + tt_ptr_op(demo_handle_get(wr4), OP_EQ, d2); + + demo_handle_free(wr2); + wr2 = NULL; + tt_ptr_op(demo_handle_get(wr3), OP_EQ, NULL); + tt_ptr_op(demo_handle_get(wr4), OP_EQ, d2); + + demo_handle_free(wr3); + wr3 = NULL; + done: + demo_handle_free(wr1); + demo_handle_free(wr2); + demo_handle_free(wr3); + demo_handle_free(wr4); + demo_free(d1); + demo_free(d2); +} + +#define HANDLE_TEST(name, flags) \ + { #name, test_handle_ ##name, (flags), NULL, NULL } + +struct testcase_t handle_tests[] = { + HANDLE_TEST(basic, 0), + END_OF_TESTCASES +}; +

1 0

[tor/master] Merge branch 'handles_squashed'
by nickm＠torproject.org 19 Apr '16

19 Apr '16

commit 520799f0846a2f32396fbbbea94a00fbe633c9d8 Merge: 94e3555 e015f7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 14:08:05 2016 -0400 Merge branch 'handles_squashed' src/common/handles.h | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + src/test/include.am | 1 + src/test/test.c | 2 + src/test/test.h | 2 +- src/test/test_handles.c | 95 ++++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 1 deletion(-)

1 0

[tor/master] Add LCOV_EXCL* markers to crypto.c and crypto_s2k.c
by nickm＠torproject.org 19 Apr '16

19 Apr '16

commit 0630f1982d18aeaf2a497b32ef73c5e1390688ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 21:13:33 2016 -0400 Add LCOV_EXCL* markers to crypto.c and crypto_s2k.c This marks some lines as unreachable by the unit tests, and as therefore excluded from test coverage. (Note: This convention is only for lines that are absolutely unreachable. Don't use it anywhere you wouldn't add a tor_fragile_assert().) --- src/common/crypto.c | 16 ++++++++++------ src/common/crypto_s2k.c | 6 ++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index d2a4269..7634887 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -134,7 +134,7 @@ crypto_get_rsa_padding_overhead(int padding) switch (padding) { case RSA_PKCS1_OAEP_PADDING: return PKCS1_OAEP_PADDING_OVERHEAD; - default: tor_assert(0); return -1; + default: tor_assert(0); return -1; // LCOV_EXCL_LINE } } @@ -146,7 +146,7 @@ crypto_get_rsa_padding(int padding) switch (padding) { case PK_PKCS1_OAEP_PADDING: return RSA_PKCS1_OAEP_PADDING; - default: tor_assert(0); return -1; + default: tor_assert(0); return -1; // LCOV_EXCL_LINE } } @@ -1739,8 +1739,8 @@ crypto_digest_algorithm_get_length(digest_algorithm_t alg) case DIGEST_SHA3_512: return DIGEST512_LEN; default: - tor_assert(0); - return 0; /* Unreachable */ + tor_assert(0); // LCOV_EXCL_LINE + return 0; /* Unreachable */ // LCOV_EXCL_LINE } } @@ -1783,8 +1783,8 @@ crypto_digest_alloc_bytes(digest_algorithm_t alg) case DIGEST_SHA3_512: return END_OF_FIELD(d.sha3); default: - tor_assert(0); - return 0; + tor_assert(0); // LCOV_EXCL_LINE + return 0; // LCOV_EXCL_LINE } #undef END_OF_FIELD #undef STRUCT_FIELD_SIZE @@ -1914,6 +1914,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, case DIGEST_SHA512: SHA512_Final(r, &tmpenv.d.sha512); break; +//LCOV_EXCL_START case DIGEST_SHA3_256: /* FALLSTHROUGH */ case DIGEST_SHA3_512: log_warn(LD_BUG, "Handling unexpected algorithm %d", digest->algorithm); @@ -1921,6 +1922,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, default: tor_assert(0); /* Unreachable. */ break; +//LCOV_EXCL_STOP } memcpy(out, r, out_len); memwipe(r, 0, sizeof(r)); @@ -2760,10 +2762,12 @@ crypto_strongest_rand(uint8_t *out, size_t out_len) while (out_len) { crypto_rand((char*) inp, DLEN); if (crypto_strongest_rand_raw(inp+DLEN, DLEN) < 0) { + // LCOV_EXCL_START log_err(LD_CRYPTO, "Failed to load strong entropy when generating an " "important key. Exiting."); /* Die with an assertion so we get a stack trace. */ tor_assert(0); + // LCOV_EXCL_STOP } if (out_len >= DLEN) { SHA512(inp, sizeof(inp), out); diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index a9140c7..149c393 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -57,7 +57,8 @@ #define SCRYPT_KEY_LEN 32 /** Given an algorithm ID (one of S2K_TYPE_*), return the length of the - * specifier part of it, without the prefix type byte. */ + * specifier part of it, without the prefix type byte. Return -1 if it is not + * a valid algorithm ID. */ static int secret_to_key_spec_len(uint8_t type) { @@ -86,7 +87,8 @@ secret_to_key_key_len(uint8_t type) case S2K_TYPE_SCRYPT: return DIGEST256_LEN; default: - return -1; + tor_fragile_assert(); // LCOV_EXCL_LINE + return -1; // LCOV_EXCL_LINE } }

1 0