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

[torspec/master] Add some missing GETINFO info/names options
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit a14d7f33d4062aa20bc416603b7ef03916f928a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:28:13 2012 -0500 Add some missing GETINFO info/names options Fixes the items listed in 3844. --- control-spec.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 6819905..1a50256 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -637,6 +637,9 @@ OptionName SP Documentation CRLF OptionPrefix SP Documentation CRLF OptionPrefix = OptionName "/*" + The OptionPrefix form indicates a number of options beginning with the + prefix. So if "config/*" is listed, other options beginning with + "config/" will work, but "config/*" itself is not an option. "events/names" A space-separated list of all the events supported by this version of @@ -708,6 +711,9 @@ "status/version/current" Status of the current version. One of: new, old, unrecommended, recommended, new in series, obsolete, unknown. + "status/version/num-concurring" + "status/version/num-versioning" + These options are deprecated; they no longer give useful information. "status/clients-seen" A summary of which countries we've seen clients from recently, formatted the same as the CLIENTS_SEEN status event described in @@ -724,6 +730,13 @@ A space-separated list of the addresses at which Tor is listening for connections of each specified type. [New in Tor 0.2.2.26-beta.] + "dir-usage" + A newline-separated list of how many bytes we've served to answer + each type of directory request. The format of each line is: + Keyword 1*SP Integer 1*SP Integer + where the first integer is the number of bytes written, and the second + is the number of requests answered. + Examples: C: GETINFO version desc/name/moria1 S: 250+desc/name/moria=

1 0

[torspec/master] Spec the maximum descriptor size.
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit b783355e8cf087ba427f4cc0db6e652540e9e272 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:18:41 2012 -0500 Spec the maximum descriptor size. Fixed 3176 --- dir-spec.txt | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index e223b2a..cb3fe46 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -354,6 +354,9 @@ http://<hostname:port>/tor/ + Neither router descriptors nor extra-info documents may exceed 20,000 + bytes in length. If they do, the authorities SHOULD reject them. + 2.1. Router descriptor format Router descriptors consist of the following items. For backward

1 0

[torspec/master] SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA is not on the v1 ciphers list
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 490c777859b96223421e247675367c792a031c75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:14:49 2012 -0500 SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA is not on the v1 ciphers list Fixes #6963; reported by cced. --- tor-spec.txt | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 186b7c0..a3df860 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -181,7 +181,6 @@ see tor-design.pdf. TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_DHE_RSA_WITH_AES_128_CBC_SHA SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA - SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA In "renegotiation" (a.k.a. "the v2 handshake"), the connection initiator sends no certificates, and @@ -335,9 +334,8 @@ see tor-design.pdf. If the client sends the Fixed Ciphersuite List, the responder MUST NOT select any ciphersuite besides TLS_DHE_RSA_WITH_AES_256_CBC_SHA, - TLS_DHE_RSA_WITH_AES_128_CBC_SHA, SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, and - SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA: such ciphers might not actually be - supported by the client. + TLS_DHE_RSA_WITH_AES_128_CBC_SHA, and SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA: + such ciphers might not actually be supported by the client. If the client sends a v2+ ClientHello with a list of ciphers other then the Fixed Ciphersuite List, the responder can trust that the client

1 0

[tor/master] In comments and logs, say "UTC" not "GMT"
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 864e15cd1c596b2a9dbc610d3aa78b49a4f33355 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:05:16 2012 -0500 In comments and logs, say "UTC" not "GMT" Fix for #6113. Note that the RFC1123 times we generate still all say 'GMT'. I'm going to suggest this is not worth changing. --- changes/bug6113 | 3 +++ src/common/tortls.c | 2 +- src/common/util.c | 11 ++++++----- src/or/confparse.h | 2 +- src/or/hibernate.c | 4 ++-- src/or/networkstatus.c | 4 ++-- src/or/statefile.c | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/changes/bug6113 b/changes/bug6113 new file mode 100644 index 0000000..436243d --- /dev/null +++ b/changes/bug6113 @@ -0,0 +1,3 @@ + o Trivial bugfixes: + - Fix log messages and comments to avoid saying "GMT" when we mean + "UTC". Fixes bug 6113. diff --git a/src/common/tortls.c b/src/common/tortls.c index 76924b3..af3059a 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2077,7 +2077,7 @@ log_cert_lifetime(int severity, const X509 *cert, const char *problem) BIO_get_mem_ptr(bio, &buf); s2 = tor_strndup(buf->data, buf->length); - strftime(mytime, 32, "%b %d %H:%M:%S %Y GMT", tor_gmtime_r(&now, &tm)); + strftime(mytime, 32, "%b %d %H:%M:%S %Y UTC", tor_gmtime_r(&now, &tm)); log(severity, LD_GENERAL, "(certificate lifetime runs from %s through %s. Your time is %s.)", diff --git a/src/common/util.c b/src/common/util.c index 1b0603a..44cdd64 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1342,7 +1342,7 @@ n_leapdays(int y1, int y2) static const int days_per_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -/** Compute a time_t given a struct tm. The result is given in GMT, and +/** Compute a time_t given a struct tm. The result is given in UTC, and * does not account for leap seconds. Return 0 on success, -1 on failure. */ int @@ -1383,10 +1383,11 @@ static const char *MONTH_NAMES[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -/** Set buf to the RFC1123 encoding of the GMT value of t. +/** Set buf to the RFC1123 encoding of the UTC value of t. * The buffer must be at least RFC1123_TIME_LEN+1 bytes long. * - * (RFC1123 format is Fri, 29 Sep 2006 15:54:20 GMT) + * (RFC1123 format is "Fri, 29 Sep 2006 15:54:20 GMT". Note the "GMT" + * rather than "UTC".) */ void format_rfc1123_time(char *buf, time_t t) @@ -1404,8 +1405,8 @@ format_rfc1123_time(char *buf, time_t t) memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3); } -/** Parse the RFC1123 encoding of some time (in GMT) from buf, - * and store the result in *t. +/** Parse the (a subset of) the RFC1123 encoding of some time (in UTC) from + * buf, and store the result in *t. * * Return 0 on success, -1 on failure. */ diff --git a/src/or/confparse.h b/src/or/confparse.h index f33208e..20616be 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -23,7 +23,7 @@ typedef enum config_type_t { CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */ CONFIG_TYPE_AUTOBOOL, /**< A boolean+auto value, expressed 0 for false, * 1 for true, and -1 for auto */ - CONFIG_TYPE_ISOTIME, /**< An ISO-formatted time relative to GMT. */ + CONFIG_TYPE_ISOTIME, /**< An ISO-formatted time relative to UTC. */ CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and * optional whitespace. */ CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */ diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 9e54eb4..7208996 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -890,12 +890,12 @@ hibernate_end_time_elapsed(time_t now) /* We weren't sleeping before; we should sleep now. */ log_notice(LD_ACCT, "Accounting period ended. Commencing hibernation until " - "%s GMT", buf); + "%s UTC", buf); hibernate_go_dormant(now); } else { log_notice(LD_ACCT, "Accounting period ended. This period, we will hibernate" - " until %s GMT",buf); + " until %s UTC",buf); } } } diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index f33de4c..63426e8 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -775,7 +775,7 @@ router_set_networkstatus_v2(const char *s, time_t arrived_at, long delta = now - ns->published_on; format_time_interval(dbuf, sizeof(dbuf), delta); log_warn(LD_GENERAL, "Network status from %s was published %s in the " - "future (%s GMT). Check your time and date settings! " + "future (%s UTC). Check your time and date settings! " "Not caching.", source_desc, dbuf, published); control_event_general_status(LOG_WARN, @@ -1874,7 +1874,7 @@ networkstatus_set_current_consensus(const char *consensus, format_iso_time(tbuf, c->valid_after); format_time_interval(dbuf, sizeof(dbuf), delta); log_warn(LD_GENERAL, "Our clock is %s behind the time published in the " - "consensus network status document (%s GMT). Tor needs an " + "consensus network status document (%s UTC). Tor needs an " "accurate clock to work correctly. Please check your time and " "date settings!", dbuf, tbuf); control_event_general_status(LOG_WARN, diff --git a/src/or/statefile.c b/src/or/statefile.c index beb9cf8..55ba0c1 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -416,7 +416,7 @@ or_state_save(time_t now) format_local_iso_time(tbuf, now); tor_asprintf(&contents, "# Tor state file last generated on %s local time\n" - "# Other times below are in GMT\n" + "# Other times below are in UTC\n" "# You *do not* need to edit this file.\n\n%s", tbuf, state); tor_free(state);

1 0

[tor/master] Note limitation of parse_rfc_1123_time
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 99669c69b3ad424c02393c97b48795eba6fb36bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 10:06:16 2012 -0500 Note limitation of parse_rfc_1123_time RFC1123 suggests that we should handle two-year times, and a full range of time zones, and other stuff too. We don't. --- src/common/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 44cdd64..61d09aa 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1408,6 +1408,9 @@ format_rfc1123_time(char *buf, time_t t) /** Parse the (a subset of) the RFC1123 encoding of some time (in UTC) from * buf, and store the result in *t. * + * Note that we only accept the subset generated by format_rfc1123_time above, + * not the full range of formats suggested by RFC 1123. + * * Return 0 on success, -1 on failure. */ int

1 0

[torspec/master] We mean UTC, not GMT. Fix bug 6113.
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit d581e631e7b89d354789d07c0513b6aef8977a72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 09:57:09 2012 -0500 We mean UTC, not GMT. Fix bug 6113. --- control-spec.txt | 16 ++++++++-------- dir-spec.txt | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 8a239d0..6819905 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -530,7 +530,7 @@ via the control interface; the 'all' target returns the mappings set through any mechanism. Expiry is formatted as with ADDRMAP events, except that "expiry" is - always a time in GMT or the string "NEVER"; see section 4.1.7. + always a time in UTC or the string "NEVER"; see section 4.1.7. First introduced in 0.2.0.3-alpha. "addr-mappings/*" -- as for address-mappings/*, but without the @@ -611,7 +611,7 @@ start and the rest of the interval respectively. The 'interval-start' and 'interval-end' fields are the borders of the current interval; the 'interval-wake' field is the time within the current interval (if any) - where we plan[ned] to start being active. The times are GMT. + where we plan[ned] to start being active. The times are UTC. "config/names" A series of lines listing the available configuration options. Each is @@ -1484,19 +1484,19 @@ Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP Error] SP GMTExpiry CRLF + [SP Error] SP UTCExpiry CRLF NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" Error = "error=" ErrorCode ErrorCode = XXXX - GMTExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE + UTCExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE - Error and GMTExpiry are only provided if extended events are enabled. + Error and UTCExpiry are only provided if extended events are enabled. - Expiry is expressed as the local time (rather than GMT). This is a bug, - left in for backward compatibility; new code should look at GMTExpiry + Expiry is expressed as the local time (rather than UTC). This is a bug, + left in for backward compatibility; new code should look at UTCExpiry instead. These events are generated when a new address mapping is entered in the @@ -1991,7 +1991,7 @@ main relays, we might start sending these events in other cases too. TimeStarted is a quoted string indicating when the reported summary - counts from (in GMT). + counts from (in UTCS). The CountrySummary keyword has as its argument a comma-separated, possibly empty set of "countrycode=count" pairs. For example (without diff --git a/dir-spec.txt b/dir-spec.txt index 39edc0f..e223b2a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -405,7 +405,7 @@ [Exactly once] - The time, in GMT, when this descriptor (and its corresponding + The time, in UTC, when this descriptor (and its corresponding extra-info document if any) was generated. "fingerprint" fingerprint NL @@ -606,7 +606,7 @@ [Exactly once.] - The time, in GMT, when this document (and its corresponding router + The time, in UTC, when this document (and its corresponding router descriptor if any) was generated. It MUST match the published time in the corresponding router descriptor. @@ -1010,14 +1010,14 @@ [Exactly once.] - The time (in GMT) when this document and corresponding key were + The time (in UTC) when this document and corresponding key were last generated. "dir-key-expires" YYYY-MM-DD HH:MM:SS NL [Exactly once.] - A time (in GMT) after which this key is no longer valid. + A time (in UTC) after which this key is no longer valid. "dir-signing-key" NL a key in PEM format @@ -1373,7 +1373,7 @@ signed (that is, not including the signature), encoded in base64. "Publication" is the publication time of its most recent descriptor, in the form - YYYY-MM-DD HH:MM:SS, in GMT. "IP" is its current IP address; + YYYY-MM-DD HH:MM:SS, in UTC. "IP" is its current IP address; ORPort is its current OR port, "DirPort" is its current directory port, or "0" for "none". @@ -2213,7 +2213,7 @@ Authorities MUST take pains to ensure that their clocks remain accurate within a few seconds. (Running NTP is usually sufficient.) - The first voting period of each day begins at 00:00 (midnight) GMT. If + The first voting period of each day begins at 00:00 (midnight) UTC. If the last period of the day would be truncated by one-half or more, it is merged with the second-to-last period.

1 0

[tor/master] Refer to RFC 4648 instead of the obsolete RFC 3548
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit e6828ea634966259a8f1bb92ef28d8b20b0dc0e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 09:51:31 2012 -0500 Refer to RFC 4648 instead of the obsolete RFC 3548 Affects comments only. For ticket 6849. --- src/common/crypto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 6c3dd8d..39f5a4a 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2736,7 +2736,7 @@ digest256_from_base64(char *digest, const char *d64) #endif } -/** Implements base32 encoding as in rfc3548. Limitation: Requires +/** Implements base32 encoding as in RFC 4648. Limitation: Requires * that srclen*8 is a multiple of 5. */ void @@ -2761,7 +2761,7 @@ base32_encode(char *dest, size_t destlen, const char *src, size_t srclen) dest[i] = '\0'; } -/** Implements base32 decoding as in rfc3548. Limitation: Requires +/** Implements base32 decoding as in RFC 4648. Limitation: Requires * that srclen*5 is a multiple of 8. Returns 0 if successful, -1 otherwise. */ int

1 0

[torspec/master] Refer to RFC 4648, not the obsolete 3548.
by nickm＠torproject.org 23 Nov '12

23 Nov '12

commit 40723457e2dd41f3063f309134528689eb721e35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 23 09:52:40 2012 -0500 Refer to RFC 4648, not the obsolete 3548. Fix for #6849, reported by grarpamp. --- rend-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index d1db467..4516b29 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -533,7 +533,7 @@ 2. Let H' = the first 80 bits of H, considering each octet from most significant bit to least significant bit. 3. Generate a 16-character encoding of H', using base32 as defined - in RFC 3548. + in RFC 4648. (We only use 80 bits instead of the 160 bits from SHA1 because we don't need to worry about arbitrary collisions, and because it will

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit 1df4095c8a74c665524d5fa4028d88bca9758fa7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 13:15:53 2012 +0000 Update translations for liveusb-creator --- bg/bg.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index af967a6..8772bf0 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-23 12:45+0000\n" +"PO-Revision-Date: 2012-11-23 12:48+0000\n" "Last-Translator: kirilvel <kirilvelinov(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -128,25 +128,25 @@ msgstr "Внимание: Създаване на нова постоянна н #: ../liveusb/gui.py:717 msgid "Download complete!" -msgstr "" +msgstr "Изтеглянето е завършено!" #: ../liveusb/gui.py:721 msgid "Download failed: " -msgstr "" +msgstr "Изтеглянето се провали:" #: ../liveusb/gui.py:722 msgid "You can try again to resume your download" -msgstr "" +msgstr "Можете да опитате отново да възобнови те изтеглянето" #: ../liveusb/gui.py:728 msgid "Select Live ISO" -msgstr "" +msgstr "Изберете Live ISO" #: ../liveusb/gui.py:731 msgid "" "The selected file is unreadable.Please fix its permissions or select another" " file." -msgstr "" +msgstr "Избраният файл е нечетлив. Моля, поправете разрешения или изберете друг файл." #: ../liveusb/gui.py:737 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Nov '12

23 Nov '12

commit 95b06a3ed208ef6a2400e04f0065c72dfb865878 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 23 12:45:54 2012 +0000 Update translations for liveusb-creator --- bg/bg.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 78c0fe5..af967a6 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-23 12:07+0000\n" +"PO-Revision-Date: 2012-11-23 12:45+0000\n" "Last-Translator: kirilvel <kirilvelinov(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -97,34 +97,34 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Внимание: Master Boot Record във вашето устройство не съответства SysLinux вашата система MBR. Ако имате проблеми при зареждането тази пръчка, опитайте се да стартирате liveusb създател - Reset-MBR вариант." #: ../liveusb/gui.py:638 msgid "Unable to mount device" -msgstr "" +msgstr "Не може да се монтира устройство" #: ../liveusb/gui.py:644 msgid "Warning: All data on the selected drive will be lost." -msgstr "" +msgstr "Внимание: Всички данни на избрания диск ще бъдат загубени." #: ../liveusb/gui.py:646 ../liveusb/gui.py:663 msgid "Press 'Next' if you wish to continue." -msgstr "" +msgstr "\"Next\" Натиснете, ако искате да продължите." #: ../liveusb/gui.py:648 ../liveusb/gui.py:665 msgid "Next" -msgstr "" +msgstr "Next" #: ../liveusb/gui.py:658 msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "" +msgstr "Вашето устройство вече съдържа LiveOS. ⏎ Ако продължите, ще бъдат презаписани." #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "" +msgstr "Внимание: Създаване на нова постоянна наслагване ще изтрие съществуващия си." #: ../liveusb/gui.py:717 msgid "Download complete!"

1 0