tor-commits June 2011

tor-commits@lists.torproject.org

14 participants
716 discussions

[arm/master] Adding cagraph to gitignore
by atagar＠torproject.org 11 Jun '11

11 Jun '11

commit b69b57080cebf0f313f3971c06489bb182d890da Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 18:38:22 2011 -0700 Adding cagraph to gitignore --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6377435..d72262b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc src/TorCtl/ +src/cagraph/ *.swp

1 0

[arm/packaging] Dropping the TorCtl copyright from deb
by atagar＠torproject.org 11 Jun '11

11 Jun '11

commit 22fba9a3f53bf1567c840b6dc3f22919748206c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 18:35:03 2011 -0700 Dropping the TorCtl copyright from deb Since TorCtl is no longer bundled with the arm deb we don't need its copyright. --- build/debian/copyright | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/build/debian/copyright b/build/debian/copyright index 0c3da03..156b34f 100644 --- a/build/debian/copyright +++ b/build/debian/copyright @@ -25,43 +25,6 @@ License: GPL On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -This is distributed with TorCtl which has the following license: -=============================================================================== -The Python Tor controller code is distributed under this license: - -Copyright 2005, Nick Mathewson, Roger Dingledine -Copyright 2007-2010, Mike Perry - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The also includes methods for reading proc files (and some of the code) -borrowd from psutil which has the following license: =============================================================================== psutil is distributed under BSD license reproduced below.

1 0

[arm/packaging] fix: only using a subset of the cagraph archive
by atagar＠torproject.org 11 Jun '11

11 Jun '11

commit 5754dceffd68975c48966f17296df640cb2acd84 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 18:30:39 2011 -0700 fix: only using a subset of the cagraph archive We use the cagraph subdirectory of the tarball rather than the whole thing. --- deps/cagraph-1.2.tar.gz | Bin 22600 -> 0 bytes deps/cagraph.tar.gz | Bin 0 -> 6936 bytes deps/fetch.sh | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deps/cagraph-1.2.tar.gz b/deps/cagraph-1.2.tar.gz deleted file mode 100644 index 9ebc16e..0000000 Binary files a/deps/cagraph-1.2.tar.gz and /dev/null differ diff --git a/deps/cagraph.tar.gz b/deps/cagraph.tar.gz new file mode 100644 index 0000000..a1af8c4 Binary files /dev/null and b/deps/cagraph.tar.gz differ diff --git a/deps/fetch.sh b/deps/fetch.sh index 03ae800..73d5505 100755 --- a/deps/fetch.sh +++ b/deps/fetch.sh @@ -6,7 +6,7 @@ # 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed # # cagraph (https://code.google.com/p/cagraph/) -# 6/10/11 - a6928f07adb8f8d4b0076e01c0ec264e1acaaa6db21376c854fa827c9b04e3f3 +# 6/10/11 - 1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d # removes old archives if they exist [ -f "torctl.tar.gz" ] && rm -f "torctl.tar.gz" @@ -22,8 +22,12 @@ rm -rf pytorctl # retrieves cagraph wget --quiet http://cagraph.googlecode.com/files/cagraph-1.2.tar.gz +tar --strip-components=1 -xzf cagraph-1.2.tar.gz cagraph-1.2/cagraph +tar -czf cagraph.tar.gz cagraph +rm -rf cagraph/ +rm cagraph-1.2.tar.gz echo "Sha256 Checksums:" sha256sum torctl.tar.gz -sha256sum cagraph-1.2.tar.gz +sha256sum cagraph.tar.gz

1 0

[obfsproxy/master] Fix warnings from clang analyzer
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit f0b136a268f39cdb7840d0bdf630e3954a245a69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 18:55:50 2011 -0400 Fix warnings from clang analyzer --- src/main.c | 10 +++++++++- src/test/unittest_obfs2.c | 17 +++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main.c b/src/main.c index ace9e8c..5ca365f 100644 --- a/src/main.c +++ b/src/main.c @@ -3,6 +3,7 @@ */ #include <stdlib.h> +#include <errno.h> #include <stdio.h> #include <string.h> #include <signal.h> @@ -251,6 +252,7 @@ main(int argc, const char **argv) Finally, we allocate space on the n_options_array so that we can put the number of options there. */ + /*XXXX (Why not actually allocate this before the start of the loop?)*/ temp = realloc(protocol_options, sizeof(char**)*actual_protocols); if (!temp) @@ -300,10 +302,16 @@ main(int argc, const char **argv) /*Let's open a new listener for each protocol. */ int h; - listener_t *listeners[actual_protocols]; + listener_t **listeners; listener_t *temp_listener; int n_listeners=0; protocol_params_t *proto_params=NULL; + listeners = calloc(sizeof(listener_t*), actual_protocols); + if (!listeners) { + log_warn("Allocation failure: %s", strerror(errno)); + return 1; + } + for (h=0;h<actual_protocols;h++) { log_debug("Spawning listener %d!", h+1); diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 62a2ff3..af31adc 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -133,9 +133,9 @@ test_proto_setup(void *data) tt_assert(server_proto->state); end: - if (client_proto->state) + if (client_proto) proto_destroy(client_proto); - if (server_proto->state) + if (server_proto) proto_destroy(server_proto); } @@ -200,10 +200,10 @@ test_proto_handshake(void *data) sizeof(crypt_t))); end: - if (client_proto->state) - proto_destroy(client_proto); - if (server_proto->state) - proto_destroy(server_proto); + if (client_proto) + proto_destroy(client_proto); + if (server_proto) + proto_destroy(server_proto); if (proto_params_client) free(proto_params_client); @@ -273,6 +273,7 @@ test_proto_transfer(void *data) output_buffer, dummy_buffer)); n = evbuffer_peek(dummy_buffer, -1, NULL, &v[0], 2); + tt_int_op(n, !=, -1); /* Let's check if it matches. */ tt_int_op(0, ==, strncmp(msg1, v[0].iov_base, 54)); @@ -294,9 +295,9 @@ test_proto_transfer(void *data) (void) n; /* XXXX: use n for something, or remove it. */ end: - if (client_proto->state) + if (client_proto) proto_destroy(client_proto); - if (server_proto->state) + if (server_proto) proto_destroy(server_proto); if (proto_params_client)

1 0

[tor/master] fix typo in changes/coverity_master spotted by rransom
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit ecc9a364c2ff8557f808dc1826e285239a5767a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 16:40:47 2011 -0400 fix typo in changes/coverity_master spotted by rransom --- changes/coverity_master | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 43ce1fd..eca003d 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,6 +1,6 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() - fails. Spotted by coverity. Bugfix on 0.2.3.1-alppa. + fails. Spotted by coverity. Bugfix on 0.2.3.1-alpha. - Fix a rare memory leak when checking the nodelist without it being present. Found by coverity. Bugfix on 0.2.3.1-alpha. o Code simplifications and refactoring:

1 0

[obfsproxy/master] Switch to 3bsd license with permission from asn
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit c8fa95d3b686c55b37e77502077514abb1ab8b09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 16:32:44 2011 -0400 Switch to 3bsd license with permission from asn --- LICENSE | 34 +++++++++++++++++++++++++++++----- src/main.c | 7 ++----- src/network.c | 7 ++----- src/network.h | 7 ++----- src/protocol.c | 4 ++++ src/protocol.h | 4 ++++ src/protocols/dummy.c | 3 +++ src/protocols/dummy.h | 3 +++ src/protocols/obfs2.c | 7 ++----- src/protocols/obfs2.h | 7 ++----- src/protocols/obfs2_crypt.c | 7 ++----- src/protocols/obfs2_crypt.h | 7 ++----- src/socks.c | 4 ++++ src/socks.h | 4 ++++ src/test/unittest.c | 7 ++----- src/test/unittest_crypt.c | 7 ++----- src/test/unittest_obfs2.c | 7 ++----- src/test/unittest_socks.c | 3 +++ src/util.c | 7 ++----- src/util.h | 7 ++----- 20 files changed, 78 insertions(+), 65 deletions(-) diff --git a/LICENSE b/LICENSE index 6d5e05f..c9dcec5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,10 +1,34 @@ -Obfsproxy is distributed under the Tiny License: +Obfsproxy is Licensed under the 3-clause BSD license: - Copyright 2011 Nick Mathewson +Copyright 2011 Nick Mathewson - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ======== src/sha256.c is based on public-domain code in LibTomCrypt, modified by the Tor diff --git a/src/main.c b/src/main.c index cebf14b..ace9e8c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdlib.h> diff --git a/src/network.c b/src/network.c index f2410ce..e3c2fa0 100644 --- a/src/network.c +++ b/src/network.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #define NETWORK_PRIVATE diff --git a/src/network.h b/src/network.h index 72a02ab..2a1daeb 100644 --- a/src/network.h +++ b/src/network.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef NETWORK_H diff --git a/src/protocol.c b/src/protocol.c index 32d8d0d..544dcef 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <stdlib.h> #include <stdio.h> #include <assert.h> diff --git a/src/protocol.h b/src/protocol.h index 69ea4aa..ceae438 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <event2/buffer.h> #ifndef PROTOCOL_H diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index bbda22f..bdf97fc 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #include <assert.h> #include <string.h> #include <stdlib.h> diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index a00248f..654e0a2 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #ifndef DUMMY_H #define DUMMY_H diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index d84d3ae..676ddd7 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <assert.h> diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index d206bc8..608ae7a 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef OBFS2_H diff --git a/src/protocols/obfs2_crypt.c b/src/protocols/obfs2_crypt.c index 57f511b..681fab6 100644 --- a/src/protocols/obfs2_crypt.c +++ b/src/protocols/obfs2_crypt.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include "config.h" diff --git a/src/protocols/obfs2_crypt.h b/src/protocols/obfs2_crypt.h index ef279e9..b449047 100644 --- a/src/protocols/obfs2_crypt.h +++ b/src/protocols/obfs2_crypt.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef OBFS2_CRYPT_H diff --git a/src/socks.c b/src/socks.c index 626ba88..7cf179b 100644 --- a/src/socks.c +++ b/src/socks.c @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> diff --git a/src/socks.h b/src/socks.h index f686253..caa7ec0 100644 --- a/src/socks.h +++ b/src/socks.h @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #ifndef SOCKS_H #define SOCKS_H diff --git a/src/test/unittest.c b/src/test/unittest.c index 41159ca..8ff3747 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdlib.h> diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index 5980636..b50d65d 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdio.h> #include <stdlib.h> diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index dd51762..62a2ff3 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdio.h> #include <stdlib.h> diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 38b124a..c85fcf9 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util.c b/src/util.c index 976dd59..d4eddb6 100644 --- a/src/util.c +++ b/src/util.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <string.h> diff --git a/src/util.h b/src/util.h index af3cd88..2705d51 100644 --- a/src/util.h +++ b/src/util.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef UTIL_H

1 0

[obfsproxy/master] Revise test data for integration test
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 9c5c93e4f57e4fd7bf18188603dfc8e76d06bf0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 16:24:27 2011 -0400 Revise test data for integration test --- src/test/integration_test/alpha | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/test/integration_test/alpha b/src/test/integration_test/alpha index 8ed2ec7..b6d68d6 100644 --- a/src/test/integration_test/alpha +++ b/src/test/integration_test/alpha @@ -33,11 +33,6 @@ THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. But Claude Shannon saw my shame. From his noiseless channel came A message sent with not a wasted byte "There are nine and sixty ways to disguise communiques - And EVERY SINGLE ONE OF THEM IS RIGHT" + And RATHER MORE THAN ONE OF THEM IS RIGHT" (apologies to Rudyard Kipling.) - - - - - (p.s. Not every stego scheme is in fact right.)

1 0

[obfsproxy/master] Added integration tests.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 155dbb59b7aafbf312094cbf7ffc439c43762d33 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 23:43:24 2011 +0200 Added integration tests. --- src/test/integration_test/alpha | 21 +++++++++ src/test/integration_test/int_test.sh | 75 +++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/src/test/integration_test/alpha b/src/test/integration_test/alpha new file mode 100644 index 0000000..5d8b67e --- /dev/null +++ b/src/test/integration_test/alpha @@ -0,0 +1,21 @@ +THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. +THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. +THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. +THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. + +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." +"Can entropy ever be reversed?" +"THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." diff --git a/src/test/integration_test/int_test.sh b/src/test/integration_test/int_test.sh new file mode 100644 index 0000000..c1ac908 --- /dev/null +++ b/src/test/integration_test/int_test.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +# replace this with your path to obfsproxy. +OBFSPROXY="/torland/obfsproxy/obfsproxy" +# replace this with your path to ncat. +NCAT="/usr/bin/ncat" + +ENTRY_PORT=4999 +SERVER_PORT=5000 +NCAT_PORT=5001 + +DIR=inttemp_temp +FILE1=$DIR/test1 +FILE2=$DIR/test2 + +mkdir $DIR ; :>$FILE1 + +# TEST 1 +# We open a server and a client and transfer a file. Then we check if the output of the +# server is the same as the file we sent. + +$NCAT -k -l -o $FILE1 -p $NCAT_PORT > /dev/null & +ncat1_pid=$! + +$OBFSPROXY --log-min-severity=warn obfs2 --dest=127.0.0.1:$NCAT_PORT server 127.0.0.1:$SERVER_PORT \ + + obfs2 --dest=127.0.0.1:$SERVER_PORT client 127.0.0.1:$ENTRY_PORT & +obfsproxy_pid=$! +sleep 1 + + +$NCAT localhost $ENTRY_PORT < alpha & +ncat2_pid=$! +sleep 2 + +if cmp -s alpha $FILE1 +then echo "GREAT SUCCESS 1!" ; rm $FILE1 +else echo "GREAT FAIL 1!" +fi + +kill -9 $ncat1_pid +kill -9 $obfsproxy_pid +kill -9 $ncat2_pid + +sleep 2 + +# TEST 2 +# We open an obfsproxy SOCKS server on the dummy protocol and an ncat listening. +# Then we configure another ncat to use SOCKS4 and transfer a file to the other ncat. +# Finally, we check if the file was sent correctly. + +:>$FILE2 + +$NCAT -k -l -o $FILE2 -p $NCAT_PORT > /dev/null & +ncat1_pid=$! + +$OBFSPROXY --log-min-severity=warn dummy socks 127.0.0.1:$SERVER_PORT & +obfsproxy_pid=$! +sleep 1 + +$NCAT --proxy-type socks4 --proxy 127.0.0.1:$SERVER_PORT \ + 127.0.0.1 $NCAT_PORT < alpha & +ncat2_pid=$! +sleep 2 + +if cmp -s alpha $FILE2 +then echo "GREAT SUCCESS 2!" ; rm $FILE2 +else echo "GREAT FAIL 2!" +fi + +kill -9 $ncat1_pid +kill -9 $obfsproxy_pid +kill -9 $ncat2_pid + +rmdir $DIR +

1 0

[obfsproxy/master] Merge branch 'bug3212'
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit bfa7d5c8e2974d5ae76830692aac5a2602f0e829 Merge: e379733 8e2ec74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 16:17:47 2011 -0400 Merge branch 'bug3212' src/test/integration_test/alpha | 43 ++++++++++++++++++ src/test/integration_test/int_test.sh | 76 +++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 0 deletions(-)

1 0

[obfsproxy/master] Tweak int_test.sh to work with more installations; add more to "alpha"
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 8e2ec74ae00dc727d3b633804e8c2bed7ee14473 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 16:17:38 2011 -0400 Tweak int_test.sh to work with more installations; add more to "alpha" --- src/test/integration_test/alpha | 22 ++++++++++++++++++++++ src/test/integration_test/int_test.sh | 7 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/test/integration_test/alpha b/src/test/integration_test/alpha index 5d8b67e..8ed2ec7 100644 --- a/src/test/integration_test/alpha +++ b/src/test/integration_test/alpha @@ -19,3 +19,25 @@ THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. "THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." "Can entropy ever be reversed?" "THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." + + In obfuscatory age geeky warfare did I wage + For hiding bits from nasty censors' sight + I was hacker to my set in that dim dark age of net + And I hacked from noon till three or four at night + + Then a rival from Helsinki said my protocol was dinky + So I flamed him with a condescending laugh, + Saying his designs for stego might as well be made of lego + And that my bikeshed was prettier by half. + + But Claude Shannon saw my shame. From his noiseless channel came + A message sent with not a wasted byte + "There are nine and sixty ways to disguise communiques + And EVERY SINGLE ONE OF THEM IS RIGHT" + + (apologies to Rudyard Kipling.) + + + + + (p.s. Not every stego scheme is in fact right.) diff --git a/src/test/integration_test/int_test.sh b/src/test/integration_test/int_test.sh index c1ac908..d97a7f7 100644 --- a/src/test/integration_test/int_test.sh +++ b/src/test/integration_test/int_test.sh @@ -1,9 +1,9 @@ #!/bin/bash # replace this with your path to obfsproxy. -OBFSPROXY="/torland/obfsproxy/obfsproxy" +OBFSPROXY="../../../obfsproxy" # replace this with your path to ncat. -NCAT="/usr/bin/ncat" +NCAT=ncat ENTRY_PORT=4999 SERVER_PORT=5000 @@ -13,7 +13,7 @@ DIR=inttemp_temp FILE1=$DIR/test1 FILE2=$DIR/test2 -mkdir $DIR ; :>$FILE1 +mkdir -p $DIR ; :>$FILE1 # TEST 1 # We open a server and a client and transfer a file. Then we check if the output of the @@ -22,6 +22,7 @@ mkdir $DIR ; :>$FILE1 $NCAT -k -l -o $FILE1 -p $NCAT_PORT > /dev/null & ncat1_pid=$! + $OBFSPROXY --log-min-severity=warn obfs2 --dest=127.0.0.1:$NCAT_PORT server 127.0.0.1:$SERVER_PORT \ + obfs2 --dest=127.0.0.1:$SERVER_PORT client 127.0.0.1:$ENTRY_PORT & obfsproxy_pid=$!

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2011