tor-commits July 2015

tor-commits@lists.torproject.org

18 participants
1250 discussions

[tor/master] Fix a couple more msvc issues, reported by gisle vanem
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 3c2eefac2e9a1db1b7d318ece20426bd3cb2a14c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 12:01:57 2015 -0400 Fix a couple more msvc issues, reported by gisle vanem --- src/common/torlog.h | 14 +++++++------- src/test/test_checkdir.c | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/torlog.h b/src/common/torlog.h index 45b2abf..67edf14 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -210,25 +210,25 @@ void log_fn_ratelim_(struct ratelim_t *ratelim, int severity, #define log_debug(domain, args, ...) \ STMT_BEGIN \ if (PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG)) \ - log_fn_(LOG_DEBUG, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__); \ + log_fn_(LOG_DEBUG, domain, __FUNCTION__, args, ##__VA_ARGS__); \ STMT_END #define log_info(domain, args,...) \ - log_fn_(LOG_INFO, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__) + log_fn_(LOG_INFO, domain, __FUNCTION__, args, ##__VA_ARGS__) #define log_notice(domain, args,...) \ - log_fn_(LOG_NOTICE, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__) + log_fn_(LOG_NOTICE, domain, __FUNCTION__, args, ##__VA_ARGS__) #define log_warn(domain, args,...) \ - log_fn_(LOG_WARN, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__) + log_fn_(LOG_WARN, domain, __FUNCTION__, args, ##__VA_ARGS__) #define log_err(domain, args,...) \ - log_fn_(LOG_ERR, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__) + log_fn_(LOG_ERR, domain, __FUNCTION__, args, ##__VA_ARGS__) /** Log a message at level <b>severity</b>, using a pretty-printed version * of the current function name. */ #define log_fn(severity, domain, args,...) \ - log_fn_(severity, domain, __PRETTY_FUNCTION__, args, ##__VA_ARGS__) + log_fn_(severity, domain, __FUNCTION__, args, ##__VA_ARGS__) /** As log_fn, but use <b>ratelim</b> (an instance of ratelim_t) to control * the frequency at which messages can appear. */ #define log_fn_ratelim(ratelim, severity, domain, args,...) \ - log_fn_ratelim_(ratelim, severity, domain, __PRETTY_FUNCTION__, \ + log_fn_ratelim_(ratelim, severity, domain, __FUNCTION__, \ args, ##__VA_ARGS__) #endif diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c index ae85944..a44584c 100644 --- a/src/test/test_checkdir.c +++ b/src/test/test_checkdir.c @@ -3,7 +3,11 @@ #include "orconfig.h" #include "or.h" + +#ifndef _WIN32 #include <dirent.h> +#endif + #include "config.h" #include "test.h" #include "util.h"

1 0

[tor/master] A nit found by qwerty1
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit bf08405348db7b2e4ae8d02b68f076ead2d5b152 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 11:41:54 2015 -0400 A nit found by qwerty1 --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e21ef9..315bc9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,7 +128,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. - o Minor features (hidden servicse): + o Minor features (hidden services): - Add the new options "HiddenServiceMaxStreams" and "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to limit the maximum number of simultaneous streams per circuit, and

1 0

[tor/master] Changelog tweaks from harmony
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 06a6948f439c596a99dd82ab4295be4bf8667ed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 11:29:40 2015 -0400 Changelog tweaks from harmony --- ChangeLog | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5864d2a..6e21ef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,21 +21,21 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? - Directory authorities track which Ed25519 identity keys have been used with which RSA1024 identity keys, and do not allow them to vary freely. Implements part of ticket 12498. - - Microdescriptors now include ed25519 identity keys. Implements + - Microdescriptors now include Ed25519 identity keys. Implements part of ticket 12498. - - Add support for offline encrypted ed25519 master keys. To use this + - Add support for offline encrypted Ed25519 master keys. To use this feature on your tor relay, run "tor --keygen" to make a new master key (or to make a new signing key if you already have a master key). Closes ticket 13642. o Major features (Hidden services): - Add the torrc option HiddenServiceNumIntroductionPoints, to - specify a fixed amount of introduction points. Its maximum value + specify a fixed number of introduction points. Its maximum value is 10 and default is 3. Closes ticket 4862. - - Remove the adaptive algorithm for chosing the number of + - Remove the adaptive algorithm for choosing the number of introduction points, which tended to leak popularity information - by changing the amount of introduction points depending on the - amount of clients the HS sees. Closes ticket 4862. + by changing the number of introduction points depending on the + number of clients the HS sees. Closes ticket 4862. o Major features (onion key cross-certification): - Relay descriptors now include signatures of their own identity @@ -46,11 +46,11 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? o Major features (performance): - Improve the runtime speed of Ed25519 operations by using the - public-domain ed25519-donna by Andrew M. ("floodyberry"). + public-domain Ed25519-donna by Andrew M. ("floodyberry"). Implements ticket 16467. - Improve the runtime speed of the ntor handshake by using an optimized curve25519 basepoint scalarmult implementation from the - public-domain ed25519-donna by Andrew M. ("floodyberry"), based on + public-domain Ed25519-donna by Andrew M. ("floodyberry"), based on ideas by Adam Langley. Implements ticket 9663. o Major bugfixes (client-side privacy, also in 0.2.6.9): @@ -80,7 +80,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? o Major bugfixes (open file limit): - The open file limit wasn't checked before calling - tor_accept_socket_nonblocking(), which would made Tor exceed the + tor_accept_socket_nonblocking(), which would make Tor exceed the limit. Now, before opening a new socket, Tor validates the open file limit just before, and if the max has been reached, return an error. Fixes bug 16288; bugfix on 0.1.1.1-alpha. @@ -99,8 +99,8 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? - The HSDir flag given by authorities now requires the Stable flag. For the current network, this results in going from 2887 to 2806 HSDirs. Also, it makes it harder for an attacker to launch a sybil - attack by raising the effort for a relay to become Stable which - takes at the very least 7 days to do so and by keeping the 96 + attack by raising the effort for a relay to become Stable to require + at the very least 7 days, while maintaining the 96 hours uptime requirement for HSDir. Implements ticket 8243. o Minor features (client):

1 0

[tor/master] Minor changelog tweaks
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 9bd9244675e8d969cc00b8d7f675bcb4151de93a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 23 17:43:42 2015 +0300 Minor changelog tweaks --- ChangeLog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0568093..5864d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? This, the second alpha in the Tor 0.2.7 series, has a number of new - features, including a manual approach to picking the number of - introduction points for hidden services, and the much stronger Ed25519 + features, including a way to manually pick the number of introduction + points for hidden services, and the much stronger Ed25519 signing key algorithm for regular Tor relays (including support for encrypted offline identity keys in the new algorithm). @@ -35,7 +35,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? - Remove the adaptive algorithm for chosing the number of introduction points, which tended to leak popularity information by changing the amount of introduction points depending on the - amount of traffic the HS sees. Closes ticket 4862. + amount of clients the HS sees. Closes ticket 4862. o Major features (onion key cross-certification): - Relay descriptors now include signatures of their own identity @@ -67,8 +67,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? regression detailed in bug 16381). This is a temporary fix since we can live with the minor issue in bug 14219 (it just results in some load on the network) but the regression of 16381 is too much - of a setback. First-round fix for bug 16381; bugfix - on 0.2.6.3-alpha. + of a setback. First-round fix for bug 16381; bugfix on 0.2.6.3-alpha. o Major bugfixes (hidden services): - When cannibalizing a circuit for an introduction point, always

1 0

[webwml/master] add a note about how we shouldn't be sending 5 shirts at once
by arma＠torproject.org 22 Jul '15

22 Jul '15

commit 3df5cb1f91ae90b8a302d5c08e0f82747beecc9c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:57:59 2015 -0400 add a note about how we shouldn't be sending 5 shirts at once --- getinvolved/en/tshirt.wml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 29d112a..0198d0d 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -37,13 +37,14 @@ The <a href="https://weather.torproject.org/">Tor Weather</a> system watches all of the relays. If you have a valid email address (lightly obfuscated is acceptable) in your ContactInfo field, - we'll automatically email you when your relay earns you a free - t-shirt. + we'll automatically email you when your relay earns you a t-shirt. </p> <p> - If you get such a mail, or you've done something else cool, - email us at tshirt(a)torproject.org with the details. + If you get such a mail, or you've done something else cool, email + us at tshirt(a)torproject.org with the details. (We want to make sure + our shirts help outreach happen all around the world, so please + understand if we can't send you 5 shirts for your 5 excellent relays.) </p> <p>

1 0

[webwml/master] update the tshirt page with the new pic and new instructions
by arma＠torproject.org 22 Jul '15

22 Jul '15

commit 3001730cfd0576f9091f4b451dd54dd763e26f1e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:28:01 2015 -0400 update the tshirt page with the new pic and new instructions --- getinvolved/en/tshirt.wml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index a0e2c54..29d112a 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -43,24 +43,34 @@ <p> If you get such a mail, or you've done something else cool, - email us at tshirt(a)torproject.org with the details. There's no need - to include a mailing address yet, you'll receive a link where you - can enter your shipping information. + email us at tshirt(a)torproject.org with the details. </p> <p> - You can choose between the traditional black and our conversation-starting - bright green. You can also see the shirts - <a href="<wiki>doc/TorShirt">in - action</a> — add your own photos there too. + The nice people at torservers.net + are handling the tshirt requests. They have <a + href="https://www.torservers.net/wiki/ttshirt/index">a variety of + colors, shapes, and sizes</a>, using the great new "roots" design + that Leiah Jansen made for us. </p> <div style="text-align: center"> - <a href="$(IMGROOT)/black-tor-tshirt.png"><img - src="$(IMGROOT)/black-tor-tshirt.png"></a> - <a href="$(IMGROOT)/green-tor-tshirt.png"><img - src="$(IMGROOT)/green-tor-tshirt.png"></a> + <a href="$(IMGROOT)/torshirtsob.jpg"><img + src="$(IMGROOT)/torshirtsob.jpg"></a> </div> + + <p> + In the past, you could choose between the traditional <a + href="$(IMGROOT)/black-tor-tshirt.png">black</a> and our <a + href="$(IMGROOT)/green-tor-tshirt.png">conversation-starting bright + green</a>. We'll bring those shirts back one day too. + </p> + + <p> + You can see the shirts <a href="<wiki>doc/TorShirt">in + action</a> — add your own photos there too. + </p> + </div>  <div id = "sidecol"> @@ -71,3 +81,4 @@ </div>  #include <foot.wmi> +

1 0

[webwml/master] add a picture of the new roots tshirt
by arma＠torproject.org 22 Jul '15

22 Jul '15

commit 79d7486c6f574d01138081f653a9dec9b7757832 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:22:30 2015 -0400 add a picture of the new roots tshirt (picture courtesy torservers.net and juris) --- images/torshirtsob.jpg | Bin 0 -> 34488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/torshirtsob.jpg b/images/torshirtsob.jpg new file mode 100644 index 0000000..3735cdd Binary files /dev/null and b/images/torshirtsob.jpg differ

1 0

[tor/master] Edit changelog entries
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 2f41dc3b9ead65402121132b03c7e4758117025b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 13:53:51 2015 -0400 Edit changelog entries --- ChangeLog | 107 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bdf1c1..0568093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,32 +15,43 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? that it can be kept offline. Relays also generate an online signing key, and a set of other Ed25519 keys and certificates. These are all automatically regenerated and rotated as needed. + Implements part of ticket 12498. - Directory authorities now vote on Ed25519 identity keys along with - RSA1024 keys. + RSA1024 keys. Implements part of ticket 12498. - Directory authorities track which Ed25519 identity keys have been used with which RSA1024 identity keys, and do not allow them to - vary freely. - - Microdescriptors now include ed25519 identity keys. + vary freely. Implements part of ticket 12498. + - Microdescriptors now include ed25519 identity keys. Implements + part of ticket 12498. - Add support for offline encrypted ed25519 master keys. To use this feature on your tor relay, run "tor --keygen" to make a new master key (or to make a new signing key if you already have a master key). Closes ticket 13642. o Major features (Hidden services): - - Add the torrc option HiddenServiceNumIntroductionPoints for an - operator to specify a fix amount of introduction points. Maximum - value is 10 and default is 3. Closes ticket 4862. + - Add the torrc option HiddenServiceNumIntroductionPoints, to + specify a fixed amount of introduction points. Its maximum value + is 10 and default is 3. Closes ticket 4862. - Remove the adaptive algorithm for chosing the number of introduction points, which tended to leak popularity information by changing the amount of introduction points depending on the amount of traffic the HS sees. Closes ticket 4862. o Major features (onion key cross-certification): - - Relay descriptors now include signatures of the identity keys - using the TAP and ntor onion keys. This allows relays to prove - ownership of their own onion keys. Because of this change, - microdescriptors no longer need to include RSA identity keys. - Implements proposal 228; closes ticket 12499. + - Relay descriptors now include signatures of their own identity + keys, made using the TAP and ntor onion keys. These signatures + allow relays to prove ownership of their own onion keys. Because + of this change, microdescriptors will no longer need to include + RSA identity keys. Implements proposal 228; closes ticket 12499. + + o Major features (performance): + - Improve the runtime speed of Ed25519 operations by using the + public-domain ed25519-donna by Andrew M. ("floodyberry"). + Implements ticket 16467. + - Improve the runtime speed of the ntor handshake by using an + optimized curve25519 basepoint scalarmult implementation from the + public-domain ed25519-donna by Andrew M. ("floodyberry"), based on + ideas by Adam Langley. Implements ticket 9663. o Major bugfixes (client-side privacy, also in 0.2.6.9): - Properly separate out each SOCKSPort when applying stream @@ -59,13 +70,21 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? of a setback. First-round fix for bug 16381; bugfix on 0.2.6.3-alpha. + o Major bugfixes (hidden services): + - When cannibalizing a circuit for an introduction point, always + extend to the chosen exit node (creating a 4 hop circuit). + Previously Tor would use the current circuit exit node, which + changed the original choice of introduction point, and could cause + the hidden service to skip excluded introduction points or + reconnect to a skipped introduction point. Fixes bug 16260; bugfix + on 0.1.0.1-rc. + o Major bugfixes (open file limit): - - The max open file limit wasn't checked before calling - tor_accept_socket_nonblocking() which made tor go beyond the open - file limit set previously. With this fix, before opening a new - socket, tor validates the open file limit just before and if the - max has been reached, return EMFILE. Fixes bug 16288; bugfix - on 0.1.1.1-alpha. + - The open file limit wasn't checked before calling + tor_accept_socket_nonblocking(), which would made Tor exceed the + limit. Now, before opening a new socket, Tor validates the open + file limit just before, and if the max has been reached, return an + error. Fixes bug 16288; bugfix on 0.1.1.1-alpha. o Major bugfixes (stability, also in 0.2.6.10): - Stop crashing with an assertion failure when parsing certain kinds @@ -86,17 +105,18 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? hours uptime requirement for HSDir. Implements ticket 8243. o Minor features (client): - - Relax the validation done to hostnames in SOCKS5 requests, and - allow '_' to cope with domains observed in the wild that are - serving non-RFC compliant records. Resolves ticket 16430. + - Relax the validation of hostnames in SOCKS5 requests, allowing the + character '_' to appear, in order to cope with domains observed in + the wild that are serving non-RFC compliant records. Resolves + ticket 16430. - Add GroupWritable and WorldWritable options to unix-socket based SocksPort and ControlPort options. These options apply to a single socket, and override {Control,Socks}SocketsGroupWritable. Closes ticket 15220. o Minor features (control protocol): - - Support network-liveness GETINFO key and NETWORK_LIVENESS events - in the control protocol. Resolves ticket 15358. + - Support network-liveness GETINFO key and NETWORK_LIVENESS event in + the control protocol. Resolves ticket 15358. o Minor features (directory authorities): - Directory authorities no longer vote against the "Fast", "Stable", @@ -116,15 +136,6 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? optionally tear down the circuit when the limit is exceeded. Part of ticket 16052. - o Minor features (performance): - - Improve the runtime speed of Ed25519 operations by using the - public-domain ed25519-donna by Andrew M. ("floodyberry"). - Implements ticket 16467. - - Improve the runtime speed of the ntor handshake by using an - optimized curve25519 basepoint scalarmult implementation from the - public-domain ed25519-donna by Andrew M. ("floodyberry"), based on - ideas by Adam Langley. Implements ticket 9663. - o Minor features (portability): - Use C99 variadic macros when the compiler is not GCC. This avoids failing compilations on MSVC, and fixes a log-file-based race @@ -137,8 +148,8 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? o Minor bugfixes (controller): - Add the descriptor ID in each HS_DESC control event. It was - missing but specified in control-spec.txt. Fixes bug 15881; bugfix - on 0.2.5.2-alpha. + missing, but specified in control-spec.txt. Fixes bug 15881; + bugfix on 0.2.5.2-alpha. o Minor bugfixes (crypto error-handling, also in 0.2.6.10): - Check for failures from crypto_early_init, and refuse to continue. @@ -148,15 +159,6 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? when implementing ticket 4900. Patch by "teor". o Minor bugfixes (hidden services): - - When cannibalizing a circuit for an introduction point, always - extend to the chosen exit node creating a 4 hop circuit instead of - using the current circuit exit node which resulted in changing the - original intro point choice. This resulted in the hidden service - skipping excluded nodes like for instance reconnecting to an - expired intro point. Fixes bug 16260; bugfix on 0.1.0.1-rc. This - is particularly important for the introduction point retry - behavior (see bug 8239) since cannibalization is allowed, which is - desired, so it's important to pin the chosen exit point. - Fix a crash when reloading configuration while at least one configured and one ephemeral hidden service exists. Fixes bug 16060; bugfix on 0.2.7.1-alpha. @@ -174,9 +176,10 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? on 0.2.6.3-alpha. Patch from "teor". o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.9): - - Fix sandboxing to work when running as a relaymby renaming of - secret_id_key, and allowing the eventfd2 and futex syscalls. Fixes - bug 16244; bugfix on 0.2.6.1-alpha. Patch by Peter Palfrader. + - Fix sandboxing to work when running as a relay, by allowing the + renaming of secret_id_key, and allowing the eventfd2 and futex + syscalls. Fixes bug 16244; bugfix on 0.2.6.1-alpha. Patch by + Peter Palfrader. - Allow systemd connections to work with the Linux seccomp2 sandbox code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by Peter Palfrader. @@ -188,12 +191,6 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? o Minor bugfixes (tests): - Use the configured Python executable when running test-stem-full. Fixes bug 16470; bugfix on 0.2.7.1-alpha. - - Document use of coverity, clang static analyzer, and clang dynamic - undefined behavior and address sanitizers in doc/HACKING. Add - clang dynamic sanitizer blacklist in - contrib/clang/sanitizer_blacklist.txt to exempt known undefined - behavior. Include detailed usage instructions in the blacklist. - Patch by "teor". Closes ticket 15817. o Minor bugfixes (tests, also in 0.2.6.9): - Fix a crash in the unit tests when built with MSVC2013. Fixes bug @@ -202,7 +199,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? o Minor bugfixes (threads, comments): - Always initialize return value in compute_desc_id in rendcommon.c Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. - - Check for NULL values in getinfo_helper_onions Patch by "teor". + - Check for NULL values in getinfo_helper_onions(). Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. - Remove undefined directive-in-macro in test_util_writepid clang 3.7 complains that using a preprocessor directive inside a macro @@ -235,6 +232,12 @@ Changes in version 0.2.7.2-alpha - 2015-07-2? authorities have long set it to 1. Closes ticket 16543. o Testing: + - Document use of coverity, clang static analyzer, and clang dynamic + undefined behavior and address sanitizers in doc/HACKING. Add + clang dynamic sanitizer blacklist in + contrib/clang/sanitizer_blacklist.txt to exempt known undefined + behavior. Include detailed usage instructions in the blacklist. + Patch by "teor". Closes ticket 15817. - The link authentication protocol code now has extensive tests. - The relay descriptor signature testing code now has extensive tests.

1 0

[tor/master] Move around and reformat items in 0.2.7.2-alpha changelog
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 997e54b1f9f07b9086068ed38206895d5ce7ccf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 13:34:54 2015 -0400 Move around and reformat items in 0.2.7.2-alpha changelog --- ChangeLog | 118 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5efd10c..5bdf1c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,15 @@ -Changes in version 0.2.7.2-alpha - 2015-07-?? - o Major features: - - Add support for offline encrypted ed25519 master keys. To use this - feature on your tor relay, run "tor --keygen" to make a new master - key (or to make a new signing key if you already have a master - key). Closes ticket 13642. - - o Major feature (Hidden Service): - - Add the torrc option HiddenServiceNumIntroductionPoints for an - operatory to specify a fix amount of introduction points. Maximum - value is 10 and default is 3. Closes ticket 4862. - - Remove the introduction point adaptative algorithm which is - leaking popularity by changing the amount of introduction points - depending on the amount of traffic the HS sees. With this, we - stick to only 3 introduction points. Closes ticket 4862. - - o Major features (Ed25519 identity keys, Prop220): +Changes in version 0.2.7.2-alpha - 2015-07-2? + This, the second alpha in the Tor 0.2.7 series, has a number of new + features, including a manual approach to picking the number of + introduction points for hidden services, and the much stronger Ed25519 + signing key algorithm for regular Tor relays (including support for + encrypted offline identity keys in the new algorithm). + + Support for Ed25519 on relays is currently limited to signing router + descriptors; later alphas in this series will extend Ed25519 key + support to more parts of the Tor protocol. + + o Major features (Ed25519 identity keys, Proposal 220): - All relays now maintain a stronger identity key, using the Ed25519 elliptic curve signature format. This master key is designed so that it can be kept offline. Relays also generate an online @@ -26,6 +21,19 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? used with which RSA1024 identity keys, and do not allow them to vary freely. - Microdescriptors now include ed25519 identity keys. + - Add support for offline encrypted ed25519 master keys. To use this + feature on your tor relay, run "tor --keygen" to make a new master + key (or to make a new signing key if you already have a master + key). Closes ticket 13642. + + o Major features (Hidden services): + - Add the torrc option HiddenServiceNumIntroductionPoints for an + operator to specify a fix amount of introduction points. Maximum + value is 10 and default is 3. Closes ticket 4862. + - Remove the adaptive algorithm for chosing the number of + introduction points, which tended to leak popularity information + by changing the amount of introduction points depending on the + amount of traffic the HS sees. Closes ticket 4862. o Major features (onion key cross-certification): - Relay descriptors now include signatures of the identity keys @@ -69,7 +77,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? service while a NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc. - o Minor feature (directory authorities, security, also in 0.2.6.9): + o Minor features (directory authorities, security, also in 0.2.6.9): - The HSDir flag given by authorities now requires the Stable flag. For the current network, this results in going from 2887 to 2806 HSDirs. Also, it makes it harder for an attacker to launch a sybil @@ -77,32 +85,18 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? takes at the very least 7 days to do so and by keeping the 96 hours uptime requirement for HSDir. Implements ticket 8243. - o Minor feature (performance): - - Improve the runtime speed of Ed25519 operations by using the - public-domain ed25519-donna by Andrew M. ("floodyberry"). - Implements ticket 16467. - - Improve the runtime speed of the ntor handshake by using an - optimized curve25519 basepoint scalarmult implementation from the - public-domain ed25519-donna by Andrew M. ("floodyberry"), based on - ideas by Adam Langley. Implements ticket 9663. - o Minor features (client): - Relax the validation done to hostnames in SOCKS5 requests, and allow '_' to cope with domains observed in the wild that are serving non-RFC compliant records. Resolves ticket 16430. - - o Minor features (client, unix sockets): - Add GroupWritable and WorldWritable options to unix-socket based SocksPort and ControlPort options. These options apply to a single socket, and override {Control,Socks}SocketsGroupWritable. Closes ticket 15220. - o Minor Features (crypto, testing): - - Now that OpenSSL has its own scrypt implementation, add an unit - test that checks for interoperability between libscrypt_scrypt() - and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt - and rely on EVP_PBE_scrypt() whenever possible. Resolves - ticket 16189. + o Minor features (control protocol): + - Support network-liveness GETINFO key and NETWORK_LIVENESS events + in the control protocol. Resolves ticket 15358. o Minor features (directory authorities): - Directory authorities no longer vote against the "Fast", "Stable", @@ -115,13 +109,22 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. - o Minor features (hidden service): + o Minor features (hidden servicse): - Add the new options "HiddenServiceMaxStreams" and "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to limit the maximum number of simultaneous streams per circuit, and optionally tear down the circuit when the limit is exceeded. Part of ticket 16052. + o Minor features (performance): + - Improve the runtime speed of Ed25519 operations by using the + public-domain ed25519-donna by Andrew M. ("floodyberry"). + Implements ticket 16467. + - Improve the runtime speed of the ntor handshake by using an + optimized curve25519 basepoint scalarmult implementation from the + public-domain ed25519-donna by Andrew M. ("floodyberry"), based on + ideas by Adam Langley. Implements ticket 9663. + o Minor features (portability): - Use C99 variadic macros when the compiler is not GCC. This avoids failing compilations on MSVC, and fixes a log-file-based race @@ -144,7 +147,7 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? its own PRNG. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced when implementing ticket 4900. Patch by "teor". - o Minor bugfixes (Hidden service): + o Minor bugfixes (hidden services): - When cannibalizing a circuit for an introduction point, always extend to the chosen exit node creating a 4 hop circuit instead of using the current circuit exit node which resulted in changing the @@ -154,17 +157,17 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? is particularly important for the introduction point retry behavior (see bug 8239) since cannibalization is allowed, which is desired, so it's important to pin the chosen exit point. - - o Minor bugfixes (hidden service): - Fix a crash when reloading configuration while at least one configured and one ephemeral hidden service exists. Fixes bug 16060; bugfix on 0.2.7.1-alpha. - - o Minor bugfixes (hidden services): - Avoid crashing with a double-free bug when we create an ephemeral hidden service but adding it fails for some reason. Fixes bug 16228; bugfix on 0.2.7.1-alpha. + o Minor bugfixes (Linux seccomp2 sandbox): + - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is + defined. Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. + o Minor bugfixes (Linux seccomp2 sandbox, also in 0.2.6.10): - Allow pipe() and pipe2() syscalls in the seccomp2 sandbox: we need these when eventfd2() support is missing. Fixes bug 16363; bugfix @@ -185,12 +188,6 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? o Minor bugfixes (tests): - Use the configured Python executable when running test-stem-full. Fixes bug 16470; bugfix on 0.2.7.1-alpha. - - o Minor bugfixes (tests, also in 0.2.6.9): - - Fix a crash in the unit tests when built with MSVC2013. Fixes bug - 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". - - o Minor enhancements (correctness, testing): - Document use of coverity, clang static analyzer, and clang dynamic undefined behavior and address sanitizers in doc/HACKING. Add clang dynamic sanitizer blacklist in @@ -198,12 +195,12 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? behavior. Include detailed usage instructions in the blacklist. Patch by "teor". Closes ticket 15817. - o Minor fixes (sandbox, files): - - Use the sandbox in tor_open_cloexec whether or not O_CLOEXEC is - defined. Patch by "teor". Fixes bug 16515; bugfix on 0.2.3.1-alpha. + o Minor bugfixes (tests, also in 0.2.6.9): + - Fix a crash in the unit tests when built with MSVC2013. Fixes bug + 16030; bugfix on 0.2.6.2-alpha. Patch from "NewEraCracker". - o Minor fixes (threads, comments): - - Always initialise return value in compute_desc_id in rendcommon.c + o Minor bugfixes (threads, comments): + - Always initialize return value in compute_desc_id in rendcommon.c Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. - Check for NULL values in getinfo_helper_onions Patch by "teor". Fixes part of bug 16115; bugfix on 0.2.7.1-alpha. @@ -223,10 +220,6 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? due to programmer error. Done as part of ticket 12498. o Removed features: - - Remove the HidServDirectoryV2 option. Now all relays offer to - store hidden service descriptors. Related to 16543. - - Remove the VoteOnHidServDirectoriesV2 option, since all - authorities have long set it to 1. Closes ticket 16543. - Tor no longer supports copies of OpenSSL that are missing support for Elliptic Curve Cryptography. In particular support for at least one of P256 or P224 is now required, with manual @@ -236,6 +229,10 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? on an operating system that has not upgraded to OpenSSL 1.0 or later, and you compile Tor from source, you will need to install a more recent OpenSSL to link Tor against.) Resolves ticket 16034. + - Remove the HidServDirectoryV2 option. Now all relays offer to + store hidden service descriptors. Related to 16543. + - Remove the VoteOnHidServDirectoriesV2 option, since all + authorities have long set it to 1. Closes ticket 16543. o Testing: - The link authentication protocol code now has extensive tests. @@ -243,10 +240,11 @@ Changes in version 0.2.7.2-alpha - 2015-07-?? extensive tests. - The test_workqueue program now runs faster, and is enabled by default as a part of "make check". - - o Features (control protocl): - - Support network-liveness GETINFO key and NETWORK_LIVENESS events - in the control protocol. Resolves ticket 15358. + - Now that OpenSSL has its own scrypt implementation, add an unit + test that checks for interoperability between libscrypt_scrypt() + and OpenSSL's EVP_PBE_scrypt() so that we could not use libscrypt + and rely on EVP_PBE_scrypt() whenever possible. Resolves + ticket 16189. Changes in version 0.2.6.10 - 2015-07-12

1 0

[tor/master] Document the torrc format as thoroughly as possible
by nickm＠torproject.org 22 Jul '15

22 Jul '15

commit 7521c3ee91a8c52cc152de6fa8b4c88b44fc3e33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 12:05:44 2015 -0400 Document the torrc format as thoroughly as possible Closes ticket 2325 --- changes/ticket2325 | 7 ++ doc/include.am | 3 +- doc/torrc_format.txt | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/util.c | 33 +------- 4 files changed, 218 insertions(+), 32 deletions(-) diff --git a/changes/ticket2325 b/changes/ticket2325 new file mode 100644 index 0000000..b96e514 --- /dev/null +++ b/changes/ticket2325 @@ -0,0 +1,7 @@ + o Documentation: + - Include a specific and (hopefully) accurate documentation of the torrc + file's meta-format in doc/torrc_format.txt. This is mainly of + interest to people writing programs to parse or generate torrc files. + This document is not a commitment to long-term compatibility; + some aspects of the current format are a bit ridiculous. + Closes ticket 2325. diff --git a/doc/include.am b/doc/include.am index 783aa95..af99501 100644 --- a/doc/include.am +++ b/doc/include.am @@ -36,7 +36,8 @@ endif EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ - doc/state-contents.txt + doc/state-contents.txt \ + doc/torrc_format.txt docdir = @docdir@ diff --git a/doc/torrc_format.txt b/doc/torrc_format.txt new file mode 100644 index 0000000..3ca187f --- /dev/null +++ b/doc/torrc_format.txt @@ -0,0 +1,207 @@ + +This document specifies the current format and semantics of the torrc +file, as of July 2015. Note that we make no guarantee about the +stability of this format. If you write something designed for strict +compatibility with this document, please expect us to break it sooner or +later. + +Yes, some of this is quite stupid. My goal here is to explain what it +does, not what it should do. + + - Nick + + + +1. File Syntax + + # A file is interpreted as every Entry in the file, in order. + TorrcFile = Line* + + Line = BlankLine | Entry + + BlankLine = WS* OptComment LF + | WS* LF + + OptComment = + | Comment + + Comment = '#' NonLF* + + # Each Entry is interpreted as an optional "Magic" flag, a key, and a + # value. + Entry = SP* OptMagic Key (SP+ | '\\' NL SP*)+ Val LF + | SP* OptMagic Key (SP* | '\\' NL SP*)* LF + + OptMagic = + | "+" + | "/" + + # Keys are always specified verbatim. They are case insensitive. It + # is an error to specify a key that Tor does not recognize. + Key = KC* + + # Sadly, every kind of value is decoded differently... + Val = QuotedVal | ContinuedVal | PlainVal + + # The text of a PlainVal is the text of its PVBody portion, + # plus the optional trailing backslash. + PlainVal = PVBody* ('\\')? SP* OptComment + + # Note that a PVBody is copied verbatim. Slashes are included + # verbatim. No changes are made. Note that a body may be empty. + PVBody = (VC | '\\' NonLF ) * + + # The text of a ContinuedVal is the text of each of its PVBody + # sub-elements, in order, concatenated. + ContinuedVal = CVal1 CVal2* CVal3 + + CVal1 = PVBody '\\' LF + CVal2 = PVBody ( '\\' LF | Comment LF ) + CVal3 = PVBody + + # The text of a QuotedVal is decoded as if it were a C string. + QuotedVal = DQ QVBody DQ SP* Comment + + QVBody = QC + | '\\' ( 'n' | 'r' | 't' | '\\' | '\'' | DQ | 'x' XD XD | OD OD? OD? ) + + XD = any hexadecimal digit + OD = any octal digit + + NonLF = Any character but '\n' + LF = '\n' | EOF + WS = ' ' | '\t' | '\r' + SP = ' ' | '\t' + DQ = '\"' + KC = Any character except an isspace() character or '#' + VC = Any character except '\\', '\n', or '#' + QC = Any character except '\n', '\\', or '\"' + +2. Mid-level Semantics + + + There are four configuration "domains", from lowest to highest priority: + + * Built-in defaults + * The "torrc_defaults" file, if any + * The "torrc" file, if any + * Arguments provided on the command line, if any. + + Normally, values from high-priority domains override low-priority + domains, but see 'magic' below. + + Configuration keys fall into three categories: singletons, lists, and + groups. + + A singleton key may appear at most once in any domain. Its + corresponding value is equal to its value in the highest-priority + domain in which it occurs. + + A list key may appear any number of times in a domain. By default, + its corresponding value is equal to all of the values specified for + it in the highest-priority domain in which it appears. (See 'magic' + below). + + A group key may appear any number of times in a domain. It is + associated with a number of other keys in the same group. The + relative positions of entries with the keys in a single group + matters, but entries with keys not in the group may be freely + interspersed. By default, the group has a value equal to all keys + and values it contains, from the highest-priority domain in which any + of its keys occurs. + + Magic: + + If the '/' flag is specified for an entry, it sets the value for + that entry to an empty list. (This will cause a higher-priority + domain to clear a list from a lower-priority domain, without + actually adding any entries.) + + If the '+' flag is specified for the first entry in a list or a + group that appears in a given domain, that list or group is + appended to the list or group from the next-lowest-priority + domain, rather than replacing it. + +3. High-level semantics + + There are further constraints on the values that each entry can take. + These constraints are out-of-scope for this document. + +4. Examples + + (Indentation is removed in this section, to avoid confusion.) + +4.1. Syntax examples + +# Here is a simple configuration entry. The key is "Foo"; the value is +# "Bar" + +Foo Bar + +# A configuration entry can have spaces in its value, as below. Here the +# key is "Foo" and the value is "Bar Baz" +Foo Bar Baz + +# This configuration entry has space at the end of the line, but those +# spaces don't count, so the key and value are still "Foo" and "Bar Baz" +Foo Bar Baz + +# There can be an escaped newline between the value and the key. This +# is another way to say key="Hello", value="World" +Hello\ +World + +# In regular entries of this kind, you can have a comment at the end of +# the line, either with a space before it or not. Each of these is a +# different spelling of key="Hello", value="World" + +Hello World #today +Hello World#tomorrow + +# One way to encode a complex entry is as a C string. This is the same +# as key="Hello", value="World!" +Hello "World!" + +# The string can contain the usual set of C escapes. This entry has +# key="Hello", and value="\"World\"\nand\nuniverse" +Hello "\"World\"\nand\nuniverse" + +# And now we get to the more-or-less awful part. +# +# Multi-line entries ending with a backslash on each line aren't so +# bad. The backslash is removed, and everything else is included +# verbatim. So this entry has key="Hello" and value="Worldandfriends" +Hello\ +World\ +and\ +friends + +# Backslashes in the middle of a line are included as-is. The key of +# this one is "Too" and the value is "Many\\Backsl\ashes here" (with +# backslashes in that last string as-is) +Too \ +Many\\\ +Backsl\ashes \\ +here + +# And here's the really yucky part. If a comment appears in a multi-line +# entry, the entry is still able to continue on the next line, as in the +# following, where the key is "This" and the value is +# "entry and some are silly" +This entry \ + # has comments \ + and some \ + are # generally \ + silly + +# But you can also write that without the backslashes at the end of the +# comment lines. That is to say, this entry is exactly the same as the +# one above! +This entry \ + # has comments + and some \ + are # generally + silly + + + diff --git a/src/common/util.c b/src/common/util.c index a5b5488..618e6a1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2829,38 +2829,9 @@ parse_config_line_from_str_verbose(const char *line, char **key_out, char **value_out, const char **err_out) { - /* I believe the file format here is supposed to be: - FILE = (EMPTYLINE | LINE)* (EMPTYLASTLINE | LASTLINE)? - - EMPTYLASTLINE = SPACE* | COMMENT - EMPTYLINE = EMPTYLASTLINE NL - SPACE = ' ' | '\r' | '\t' - COMMENT = '#' NOT-NL* - NOT-NL = Any character except '\n' - NL = '\n' - - LASTLINE = SPACE* KEY SPACE* VALUES - LINE = LASTLINE NL - KEY = KEYCHAR+ - KEYCHAR = Any character except ' ', '\r', '\n', '\t', '#', "\" - - VALUES = QUOTEDVALUE | NORMALVALUE - QUOTEDVALUE = QUOTE QVCHAR* QUOTE EOLSPACE? - QUOTE = '"' - QVCHAR = KEYCHAR | ESC ('n' | 't' | 'r' | '"' | ESC |'\'' | OCTAL | HEX) - ESC = "\\" - OCTAL = ODIGIT (ODIGIT ODIGIT?)? - HEX = ('x' | 'X') HEXDIGIT HEXDIGIT - ODIGIT = '0' .. '7' - HEXDIGIT = '0'..'9' | 'a' .. 'f' | 'A' .. 'F' - EOLSPACE = SPACE* COMMENT? - - NORMALVALUE = (VALCHAR | ESC ESC_IGNORE | CONTINUATION)* EOLSPACE? - VALCHAR = Any character except ESC, '#', and '\n' - ESC_IGNORE = Any character except '#' or '\n' - CONTINUATION = ESC NL ( COMMENT NL )* + /* + See torrc_format.txt for a description of the (silly) format this parses. */ - const char *key, *val, *cp; int continuation = 0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2015