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

[tor/master] Merge remote-tracking branch 'public/bug11465'
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 125c8e54680c936b9e532597372c62ac47af4fa9 Merge: 03e0c7e bd83d0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 20:55:28 2014 -0400 Merge remote-tracking branch 'public/bug11465' changes/bug11465 | 9 +++++++++ src/common/backtrace.c | 18 ++++++++++++++++-- src/common/backtrace.h | 6 ++++++ src/common/sandbox.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-)

1 0

[tor/master] Answer a question in a comment; fix a wide line.
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 03e0c7e36608ba3830c3e6948529a3aca2edcfc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 20:52:31 2014 -0400 Answer a question in a comment; fix a wide line. --- src/or/routerlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 98a8adc..f019735 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -98,7 +98,8 @@ static smartlist_t *trusted_dir_servers = NULL; * and all fallback directory servers. */ static smartlist_t *fallback_dir_servers = NULL; -/** List of [XXX what?] for a given authority, and download status for latest certificate. +/** List of certificates for a single authority, and download status for + * latest certificate. */ struct cert_list_t { /*

1 0

[meek/master] Document turnaroundTimeout.
by dcf＠torproject.org 15 Apr '14

15 Apr '14

commit f5d9da222efc2de97c82b2b3386d9041149a02d3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 16:26:04 2014 -0700 Document turnaroundTimeout. --- meek-server/meek-server.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 697c153..c7d7e41 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -22,6 +22,8 @@ import "git.torproject.org/pluggable-transports/goptlib.git" const ptMethodName = "meek" const minSessionIdLength = 32 const maxPayloadLength = 0x10000 +// How long we try to read something back from the ORPort before returning the +// response. const turnaroundTimeout = 10 * time.Millisecond // Passed as ReadTimeout and WriteTimeout when constructing the http.Server. const readWriteTimeout = 10 * time.Second

1 0

[meek/master] Put a time limit (10 seconds) on reading requests and writing responses.
by dcf＠torproject.org 15 Apr '14

15 Apr '14

commit 905333debb47858dcff83e97543920f3e2ff9655 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 16:23:05 2014 -0700 Put a time limit (10 seconds) on reading requests and writing responses. Fixed #11504. --- meek-server/meek-server.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 51f094e..a9b1120 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -23,6 +23,8 @@ const ptMethodName = "meek" const minSessionIdLength = 32 const maxPayloadLength = 0x10000 const turnaroundDeadline = 10 * time.Millisecond +// Passed as ReadTimeout and WriteTimeout when constructing the http.Server. +const readWriteTimeout = 10 * time.Second const maxSessionStaleness = 120 * time.Second var ptInfo pt.ServerInfo @@ -231,6 +233,8 @@ func startServer(ln net.Listener) (net.Listener, error) { go state.ExpireSessions() server := &http.Server{ Handler: state, + ReadTimeout: readWriteTimeout, + WriteTimeout: readWriteTimeout, } go func() { defer ln.Close()

1 0

[meek/master] My golang-nuts post on Listen/Serve that never went anywhere.
by dcf＠torproject.org 15 Apr '14

15 Apr '14

commit 6946cc0323fcb0ebbc14420fa3293e7525f412da Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 16:08:33 2014 -0700 My golang-nuts post on Listen/Serve that never went anywhere. --- meek-server/meek-server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 510bfa3..51f094e 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -187,6 +187,7 @@ func listenTLS(network string, addr *net.TCPAddr, certFilename, keyFilename stri // We have to separate the Listen and Serve parts because we need to // report the listening address before entering Serve (which is an // infinite loop). + // https://groups.google.com/d/msg/Golang-nuts/3F1VRCCENp8/3hcayZiwYM8J config := &tls.Config{} config.NextProtos = []string{"http/1.1"}

1 0

[meek/master] turnaroundDeadline is actually a timeout.
by dcf＠torproject.org 15 Apr '14

15 Apr '14

commit e0227e02a732b51c14876b35e78ab66ce72667b3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 16:24:40 2014 -0700 turnaroundDeadline is actually a timeout. That is, a time.Duration, not a time.Time. --- meek-server/meek-server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index a9b1120..697c153 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -22,7 +22,7 @@ import "git.torproject.org/pluggable-transports/goptlib.git" const ptMethodName = "meek" const minSessionIdLength = 32 const maxPayloadLength = 0x10000 -const turnaroundDeadline = 10 * time.Millisecond +const turnaroundTimeout = 10 * time.Millisecond // Passed as ReadTimeout and WriteTimeout when constructing the http.Server. const readWriteTimeout = 10 * time.Second const maxSessionStaleness = 120 * time.Second @@ -119,7 +119,7 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error } buf := make([]byte, maxPayloadLength) - session.Or.SetReadDeadline(time.Now().Add(turnaroundDeadline)) + session.Or.SetReadDeadline(time.Now().Add(turnaroundTimeout)) n, err := session.Or.Read(buf) if err != nil { if e, ok := err.(net.Error); !ok || !e.Timeout() {

1 0

r26711: {website} add new mirror (website/trunk/include)
by Andrew Lewman 15 Apr '14

15 Apr '14

Author: phobos Date: 2014-04-15 20:43:54 +0000 (Tue, 15 Apr 2014) New Revision: 26711 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-04-15 13:34:53 UTC (rev 26710) +++ website/trunk/include/tor-mirrors.csv 2014-04-15 20:43:54 UTC (rev 26711) @@ -90,3 +90,4 @@ Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Sun Apr 13 08:04:43 2014 Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Sun Apr 13 08:04:43 2014 jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Sun Apr 13 08:04:43 2014 +tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu,,, http://tor.miglix.eu/dist/,https://tor.miglix.eu/dist/, ,,

1 0

[tor/master] Fix compiler warning on test_status.c
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 1126ce1d86e925097c855a33c6a33638e086d35e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 15:19:41 2014 -0400 Fix compiler warning on test_status.c --- src/test/test_status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_status.c b/src/test/test_status.c index 09c9935..b704053 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -223,7 +223,7 @@ NS(test_main)(void *arg) tor_free(actual); expected = "10.00 GB"; - actual = bytes_to_usage((1 << 30) * 10L); + actual = bytes_to_usage((U64_LITERAL(1) << 30) * 10L); tt_str_op(actual, ==, expected); tor_free(actual);

1 0

[tor/master] Merge remote-tracking branch 'public/bug11513_024'
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 2704441e7ff1242d168bc14dda946fc41844f2c5 Merge: 9556668 bd3db82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:54:25 2014 -0400 Merge remote-tracking branch 'public/bug11513_024' changes/bug11513 | 12 ++++ src/common/gen_server_ciphers.py | 115 ++++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 40 +++++++++---- 3 files changed, 155 insertions(+), 12 deletions(-)

1 0

[tor/master] New sort order for server choice of ciphersuites.
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit bd3db82906a2efcd678b5f4b61fef26c93828777 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 14:10:05 2014 -0400 New sort order for server choice of ciphersuites. Back in 175b2678, we allowed servers to recognize clients who are telling them the truth about their ciphersuites, and select the best cipher from on that list. This implemented the server side of proposal 198. In bugs 11492, 11498, and 11499, cypherpunks found a bunch of mistakes and omissions and typos in the UNRESTRICTED_SERVER_CIPHER_LIST we had. In #11513, I found a couple more. Rather than try to hand-edit this list, I wrote a short python script to generate our ciphersuite preferences from the openssl headers. The new rules are: * Require forward secrecy. * Require RSA (since our servers only configure RSA keys) * Require AES or 3DES. (This means, reject RC4, DES, SEED, CAMELLIA, and NULL.) * No export ciphersuites. Then: * Prefer AES to 3DES. * If both suites have the same cipher, prefer ECDHE to DHE. * If both suites have the same DHE group type, prefer GCM to CBC. * If both suites have the same cipher mode, prefer SHA384 to SHA256 to SHA1. * If both suites have the same digest, prefer AES256 to AES128. --- changes/bug11513 | 12 ++++ src/common/gen_server_ciphers.py | 115 ++++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 40 +++++++++---- 3 files changed, 155 insertions(+), 12 deletions(-) diff --git a/changes/bug11513 b/changes/bug11513 new file mode 100644 index 0000000..820c026 --- /dev/null +++ b/changes/bug11513 @@ -0,0 +1,12 @@ + o Major bugfixes: + - Generate the server's preference list for ciphersuites + automatically based on uniform criteria, and considering all + OpenSSL ciphersuites with acceptable strength and forward + secrecy. (The sort order is: prefer AES to 3DES; break ties by + preferring ECDHE to DHE; break ties by preferring GCM to CBC; + break ties by preferring SHA384 to SHA256 to SHA1; and finally, + break ties by preferring AES256 to AES128.) This resolves bugs + #11513, #11492, #11498, #11499. Bugs reported by 'cypherpunks'. + Bugfix on 0.2.4.8-alpha. + + diff --git a/src/common/gen_server_ciphers.py b/src/common/gen_server_ciphers.py new file mode 100755 index 0000000..97ed9d0 --- /dev/null +++ b/src/common/gen_server_ciphers.py @@ -0,0 +1,115 @@ +#!/usr/bin/python +# Copyright 2014, The Tor Project, Inc +# See LICENSE for licensing information + +# This script parses openssl headers to find ciphersuite names, determines +# which ones we should be willing to use as a server, and sorts them according +# to preference rules. +# +# Run it on all the files in your openssl include directory. + +import re +import sys + +EPHEMERAL_INDICATORS = [ "_EDH_", "_DHE_", "_ECDHE_" ] +BAD_STUFF = [ "_DES_40_", "MD5", "_RC4_", "_DES_64_", + "_SEED_", "_CAMELLIA_", "_NULL" ] + +# these never get #ifdeffed. +MANDATORY = [ + "TLS1_TXT_DHE_RSA_WITH_AES_256_SHA", + "TLS1_TXT_DHE_RSA_WITH_AES_128_SHA", + "SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA", +] + +def find_ciphers(filename): + with open(filename) as f: + for line in f: + m = re.search(r'(?:SSL3|TLS1)_TXT_\w+', line) + if m: + yield m.group(0) + +def usable_cipher(ciph): + ephemeral = False + for e in EPHEMERAL_INDICATORS: + if e in ciph: + ephemeral = True + if not ephemeral: + return False + + if "_RSA_" not in ciph: + return False + + for b in BAD_STUFF: + if b in ciph: + return False + return True + +# All fields we sort on, in order of priority. +FIELDS = [ 'cipher', 'fwsec', 'mode', 'digest', 'bitlength' ] +# Map from sorted fields to recognized value in descending order of goodness +FIELD_VALS = { 'cipher' : [ 'AES', 'DES'], + 'fwsec' : [ 'ECDHE', 'DHE' ], + 'mode' : [ 'GCM', 'CBC' ], + 'digest' : [ 'SHA384', 'SHA256', 'SHA' ], + 'bitlength' : [ '256', '128', '192' ], +} + +class Ciphersuite(object): + def __init__(self, name, fwsec, cipher, bitlength, mode, digest): + self.name = name + self.fwsec = fwsec + self.cipher = cipher + self.bitlength = bitlength + self.mode = mode + self.digest = digest + + for f in FIELDS: + assert(getattr(self, f) in FIELD_VALS[f]) + + def sort_key(self): + return tuple(FIELD_VALS[f].index(getattr(self,f)) for f in FIELDS) + + +def parse_cipher(ciph): + m = re.match('(?:TLS1|SSL3)_TXT_(EDH|DHE|ECDHE)_RSA(?:_WITH)?_(AES|DES)_(256|128|192)(|_CBC|_CBC3|_GCM)_(SHA|SHA256|SHA384)$', ciph) + + if not m: + print "/* Couldn't parse %s ! */"%ciph + return None + + fwsec, cipher, bits, mode, digest = m.groups() + if fwsec == 'EDH': + fwsec = 'DHE' + + if mode in [ '_CBC3', '_CBC', '' ]: + mode = 'CBC' + elif mode == '_GCM': + mode = 'GCM' + + return Ciphersuite(ciph, fwsec, cipher, bits, mode, digest) + +ALL_CIPHERS = [] + +for fname in sys.argv[1:]: + ALL_CIPHERS += (parse_cipher(c) + for c in find_ciphers(fname) + if usable_cipher(c) ) + +ALL_CIPHERS.sort(key=Ciphersuite.sort_key) + +for c in ALL_CIPHERS: + if c is ALL_CIPHERS[-1]: + colon = ';' + else: + colon = ' ":"' + + if c.name in MANDATORY: + print " /* Required */" + print ' %s%s'%(c.name,colon) + else: + print "#ifdef %s"%c.name + print ' %s%s'%(c.name,colon) + print "#endif" + + diff --git a/src/common/tortls.c b/src/common/tortls.c index 886ee0d..bbbf6a5 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -714,31 +714,47 @@ tor_tls_create_certificate(crypto_pk_t *rsa, /** List of ciphers that servers should select from when we actually have * our choice of what cipher to use. */ const char UNRESTRICTED_SERVER_CIPHER_LIST[] = -#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_256_CHC_SHA - TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA ":" -#endif + /* This list is autogenerated with the gen_server_ciphers.py script; + * don't hand-edit it. */ #ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384 TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ":" #endif +#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 + TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":" +#endif +#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384 + TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384 ":" +#endif #ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256 TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256 ":" #endif +#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA + TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA ":" +#endif #ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA ":" #endif -#ifdef TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384 + TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384 ":" +#endif +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 + TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 ":" +#endif +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 + TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 ":" +#endif +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256 + TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256 ":" #endif -//#if TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA -// TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA ":" -//#endif - /* These next two are mandatory. */ - TLS1_TXT_DHE_RSA_WITH_AES_256_SHA ":" - TLS1_TXT_DHE_RSA_WITH_AES_128_SHA ":" + /* Required */ + TLS1_TXT_DHE_RSA_WITH_AES_256_SHA ":" + /* Required */ + TLS1_TXT_DHE_RSA_WITH_AES_128_SHA ":" #ifdef TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA ":" #endif - SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA; + /* Required */ + SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA; /* Note: to set up your own private testing network with link crypto * disabled, set your Tors' cipher list to

1 0