- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug3825b-v8-squashed'
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 4080ac9eee76bf7ef92e71a5a9af27a2aa354ca9 Merge: ec18c8a dae0007 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 11:15:49 2011 -0500 Merge branch 'bug3825b-v8-squashed' changes/bug3825b | 7 +++ src/or/or.h | 5 ++ src/or/rendservice.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 138 insertions(+), 2 deletions(-)

1 0

[stem/master] Strip whitespaces from is_running ps results
by atagar＠torproject.org 19 Dec '11

19 Dec '11

commit f1a41ecc8534327772f9eca3430e373a2b8a54b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 19 09:52:03 2011 -0800 Strip whitespaces from is_running ps results Fix and unit testing for whitespace in the ps results. Also fixing the unit test so we make sure that we get False rather than None when we confirmed that the command wasn't running. --- stem/util/system.py | 1 + test/unit/util/system.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 659d3ca..8d4708e 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -136,6 +136,7 @@ def is_running(command): command_listing = call(secondary_resolver) if command_listing: + command_listing = map(str.strip, command_listing) return command in command_listing return None diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 1941c46..e3d1225 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -84,7 +84,7 @@ class TestSystem(unittest.TestCase): """ # mock response with a linux and bsd resolver - running_commands = ["irssi", "moc", "tor", "ps"] + running_commands = ["irssi", "moc", "tor", "ps", " firefox "] for ps_cmd in (system.IS_RUNNING_PS_LINUX, system.IS_RUNNING_PS_BSD): system.CALL_MOCKING = functools.partial(mock_call, ps_cmd, running_commands) @@ -93,7 +93,8 @@ class TestSystem(unittest.TestCase): self.assertTrue(system.is_running("moc")) self.assertTrue(system.is_running("tor")) self.assertTrue(system.is_running("ps")) - self.assertFalse(system.is_running("something_else")) + self.assertTrue(system.is_running("firefox")) + self.assertEqual(False, system.is_running("something_else")) # mock both calls failing system.CALL_MOCKING = lambda cmd: None

1 0

[stem/master] Fixing the reg exp to accept git SHA1 in Version
by atagar＠torproject.org 19 Dec '11

19 Dec '11

commit 292a90b6aac0574453f0187f3705e84aee59f808 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Dec 19 22:20:01 2011 +0530 Fixing the reg exp to accept git SHA1 in Version Originally the reg exp checked didn't take into account the git commit [0.2.2.23-alpha (git-7dcd105be34a4f44)], which produced an Error. Now, the status tag consumes the git SHA1 as well. Appropriate test cases have been added for integ testing. --- stem/version.py | 4 ++-- test/unit/version.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stem/version.py b/stem/version.py index 26080cc..b984125 100644 --- a/stem/version.py +++ b/stem/version.py @@ -88,14 +88,14 @@ class Version: def __init__(self, version_str): """ Parses a valid tor version string, for instance "0.1.4" or - "0.2.2.23-alpha". + "0.2.2.23-alpha (git-7dcd105be34a4f44)". Raises: ValueError if input isn't a valid tor version """ self.version_str = version_str - m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', version_str) + m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-.*)?$', version_str) if m: major, minor, micro, patch, status = m.groups() diff --git a/test/unit/version.py b/test/unit/version.py index 7cff127..787d9c8 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -16,6 +16,10 @@ class TestVersion(unittest.TestCase): """ # valid versions with various number of compontents to the version + + version = stem.version.Version("0.1.2.3-tag (git-7dcd105be34a4f44)") + self.assert_versions_match(version, 0, 1, 2, 3, "tag (git-7dcd105be34a4f44)") + version = stem.version.Version("0.1.2.3-tag") self.assert_versions_match(version, 0, 1, 2, 3, "tag") @@ -50,6 +54,7 @@ class TestVersion(unittest.TestCase): # check for basic incrementing in each portion self.assert_version_is_greater("1.1.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("1.1.2.3-tag (git-7dcd105be34a4f44)", "0.1.2.3-tag (git-7dcd105be34a4f44)") self.assert_version_is_greater("0.2.2.3-tag", "0.1.2.3-tag") self.assert_version_is_greater("0.1.3.3-tag", "0.1.2.3-tag") self.assert_version_is_greater("0.1.2.4-tag", "0.1.2.3-tag") @@ -86,7 +91,7 @@ class TestVersion(unittest.TestCase): """ # checks conversion with various numbers of arguments - + self.assert_string_matches("0.1.2.3-tag (git-7dcd105be34a4f44)") self.assert_string_matches("0.1.2.3-tag") self.assert_string_matches("0.1.2.3") self.assert_string_matches("0.1.2")

1 0

[obfsproxy/master] Improve obfs2 doc/protocol-spec.txt.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit f439d980caef07a834771fde90a726dcf156e31d Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 19 13:42:03 2011 +0100 Improve obfs2 doc/protocol-spec.txt. * Change E_K(s) notation to E(K,s) to improve readability. * Mention that the connection should be closed immediately in the case of wrong plength/magic (#3291). * Mention that the shared secret is hashed before using it in MAC(). --- doc/protocol-spec.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/protocol-spec.txt b/doc/protocol-spec.txt index c11f653..4035b23 100644 --- a/doc/protocol-spec.txt +++ b/doc/protocol-spec.txt @@ -1,4 +1,4 @@ -The Twobfuscator + obfs2 (The Twobfuscator) 0. Protocol overview @@ -17,9 +17,9 @@ The Twobfuscator 1. Primitives, notation, and constants. H(x) is SHA256 of x. - H^n(x) is H(x) called iteratively n times. + H^n(x) is H(x) called iteratively n times. - E_K(s) is the AES-CTR-128 encryption of s using K as key. + E(K,s) is the AES-CTR-128 encryption of s using K as key. x | y is the concatenation of x and y. UINT32(n) is the 4 byte value of n in big-endian (network) order. @@ -34,8 +34,8 @@ The Twobfuscator MAX_PADDING is 8192 HASH_ITERATIONS is 100000 - KEYLEN is the length of the key used by E_K(s) -- that is, 16. - IVLEN is the length of the IV used by E_K(s) -- that is, 16 + KEYLEN is the length of the key used by E(K,s) -- that is, 16. + IVLEN is the length of the IV used by E(K,s) -- that is, 16. HASHLEN is the length of the output of H() -- that is, 32. @@ -64,18 +64,17 @@ The Twobfuscator The initiator then sends: - SEED | INIT_PAD_KEY( UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN) ) + INIT_SEED | E(INIT_PAD_KEY, UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN)) and the responder replies with: - SEED | RESP_PAD_KEY( UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN) ) + RESP_SEED | E(RESP_PAD_KEY, UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN)) Upon receiving the SEED from the other party, each party derives the other party's padding key value as above, and decrypts the next 8 bytes of the key establishment message. If the MAGIC_VALUE does not match, or the PADLEN value is greater than MAX_PADDING, the - party receiving it should wait for a random amount of time (with - maximum wait time being 4 seconds) then close the connection. + party receiving it should close the connection immediately. Otherwise, it should read the remaining PADLEN bytes of padding data and discard them. @@ -99,6 +98,6 @@ The Twobfuscator Optionally, if the client and server share a secret value SECRET, they can replace the MAC function with: - MAC(s,x) = H^n(s | x | SECRET | s) + MAC(s,x) = H^n(s | x | H(SECRET) | s) where n = HASH_ITERATIONS.

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4559'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit bf9c087ec53e60bc203fa02374a2b7707e61a14f Merge: 1467e33 f439d98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 12:18:40 2011 -0500 Merge remote-tracking branch 'asn/bug4559' doc/protocol-spec.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4741'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit 1467e33489eca8d12230cdbdf6626ee5037cd86d Merge: da0fb3e eb5e255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 12:15:03 2011 -0500 Merge remote-tracking branch 'asn/bug4741' src/network.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)

1 0

[obfsproxy/master] Don't log transmission on a closed connection.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit eb5e25534667b2b18c5ee8c7c2f0b06bbb0f6c69 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Dec 16 16:55:48 2011 +0100 Don't log transmission on a closed connection. --- src/network.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/network.c b/src/network.c index a1fbe41..c36de25 100644 --- a/src/network.c +++ b/src/network.c @@ -614,10 +614,11 @@ upstream_read_cb(struct bufferevent *bev, void *arg) bufferevent_get_output(down->buffer))) { log_debug("%s: error during transmit.", up->peername); conn_free(up); + } else { + log_debug("%s: transmitted %lu bytes", down->peername, + (unsigned long) + evbuffer_get_length(bufferevent_get_output(down->buffer))); } - log_debug("%s: transmitted %lu bytes", down->peername, - (unsigned long) - evbuffer_get_length(bufferevent_get_output(down->buffer))); } /** @@ -663,10 +664,11 @@ downstream_read_cb(struct bufferevent *bev, void *arg) bufferevent_get_output(down->buffer)) < 0) { log_debug("%s: error during reply.", down->peername); conn_free(down); + } else { + log_debug("%s: transmitted %lu bytes", down->peername, + (unsigned long) + evbuffer_get_length(bufferevent_get_output(down->buffer))); } - log_debug("%s: transmitted %lu bytes", down->peername, - (unsigned long) - evbuffer_get_length(bufferevent_get_output(down->buffer))); } } }

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4742'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit da0fb3efd3be668f0b732ecb7b006b9140b012df Merge: d589ba6 710d2c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 11:37:31 2011 -0500 Merge remote-tracking branch 'asn/bug4742' src/main.c | 6 +++--- src/protocols/obfs2.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-)

1 0

[obfsproxy/master] Improve usage() instructions of obfsproxy.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit 710d2c7b7ea3adee74e315fc0bfcf7bb1dacf210 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 19 13:52:46 2011 +0100 Improve usage() instructions of obfsproxy. --- src/main.c | 6 +++--- src/protocols/obfs2.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.c b/src/main.c index c7515a2..c32d890 100644 --- a/src/main.c +++ b/src/main.c @@ -33,13 +33,13 @@ void ATTR_NORETURN usage(void) { int i; - fputs("Usage: obfsproxy protocol_name [protocol_args] protocol_options " - "protocol_name ...\n" + fputs("Usage: obfsproxy [obfsproxy_args] protocol_name [protocol_args] " + "protocol_options protocol_name ...\n" "* Available protocols:\n", stderr); /* this is awful. */ for (i=0;i<n_supported_protocols;i++) fprintf(stderr,"[%s] ", supported_protocols[i]->name); - fprintf(stderr, "\n* Available arguments:\n" + fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" "--log-min-severity=warn|info|debug ~ set minimum logging severity\n" "--no-log ~ disable logging\n"); diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 6e241c3..9d65067 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -85,17 +85,17 @@ obfs2_config_create(int n_options, const char *const *options) obfs2_config_free(&cfg->super); log_warn("You failed at creating a correct obfs2 line.\n" - "obfs2 syntax:\n" - "\tobfs2 [obfs2_args] obfs2_opts\n" - "\t'obfs2_opts':\n" - "\t\tmode ~ server|client|socks\n" - "\t\tlisten address ~ host:port\n" - "\t'obfs2_args':\n" - "\t\tDestination Address ~ --dest=host:port\n" - "\t\tShared Secret ~ --shared-secret=<secret>\n" - "\tExample:\n" - "\tobfsproxy --dest=127.0.0.1:666 --shared-secret=himitsu " - "\tobfs2 server 127.0.0.1:1026"); + "obfs2 syntax:\n" + "\tobfs2 [obfs2_args] obfs2_opts\n" + "\t'obfs2_opts':\n" + "\t\tmode ~ server|client|socks\n" + "\t\tlisten address ~ host:port\n" + "\t'obfs2_args':\n" + "\t\tDestination Address ~ --dest=host:port\n" + "\t\tShared Secret ~ --shared-secret=<secret>\n" + "\tExample:\n" + "\tobfsproxy obfs2 --dest=127.0.0.1:666 --shared-secret=himitsu " + "server 127.0.0.1:1026"); return NULL; } @@ -174,7 +174,7 @@ parse_and_set_options(int n_options, const char *const *options, got_ss=1; } else { - log_warn("obfs2: Unknown argument."); + log_warn("obfs2: Unknown argument '%s'.", *options); return -1; } options++;

1 0

[tor/master] -lm should not be hardcoded.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit f783a326b82518bf75b1d3952332b05aac7ffd9b Author: Martin Hebnes Pedersen <martin.h.pedersen(a)gmail.com> Date: Sat Dec 17 14:30:41 2011 +0100 -lm should not be hardcoded. On some platforms (Haiku/BeOS) libm lives in libcore. Also added 'network' to the list of libraries to search for connect(). --- configure.in | 16 +++++++++++++++- src/or/Makefile.am | 2 +- src/test/Makefile.am | 8 ++++---- src/tools/Makefile.am | 8 +++++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index b05e935..d1b7c44 100644 --- a/configure.in +++ b/configure.in @@ -279,7 +279,7 @@ fi AC_C_BIGENDIAN -AC_SEARCH_LIBS(socket, [socket]) +AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl]) AC_SEARCH_LIBS(inet_aton, [resolv]) @@ -483,6 +483,20 @@ fi AC_SUBST(TOR_LIBEVENT_LIBS) dnl ------------------------------------------------------ +dnl Where do you live, libm? + +dnl On some platforms (Haiku/BeOS) the math library is +dnl part of libroot. In which case don't link against lm +TOR_LIB_MATH="" +save_LIBS="$LIBS" +AC_SEARCH_LIBS(cos, [m], , AC_MSG_ERROR([Could not find libm and libcore does not provide the functions.])) +if test "$ac_cv_search_cos" != "none required"; then + TOR_LIB_MATH="$ac_cv_search_cos" +fi +LIBS="$save_LIBS" +AC_SUBST(TOR_LIB_MATH) + +dnl ------------------------------------------------------ dnl Where do you live, openssl? And how do we call you? tor_openssl_pkg_redhat="openssl" diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a568208..57f5dd6 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -74,7 +74,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 73de300..e766446 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -31,15 +31,15 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ bench_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ tinytest.h \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index a9a6197..35b0a41 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -3,17 +3,19 @@ noinst_PROGRAMS = tor-checkkey tor_resolve_SOURCES = tor-resolve.c tor_resolve_LDFLAGS = -tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@ +tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@ tor_gencert_SOURCES = tor-gencert.c tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ tor_checkkey_SOURCES = tor-checkkey.c tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ SUBDIRS = tor-fw-helper DIST_SUBDIRS = tor-fw-helper

1 0