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

[torbrowser/maint-2.3] Merge branch 'openssl-1.0.1a-fix' into maint-2.2
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.2] Merge branch 'openssl-1.0.1a-fix' into maint-2.2
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] OSX: Fix 64bit compile of openssl
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch new file mode 100644 index 0000000..3fbd39c --- /dev/null +++ b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch @@ -0,0 +1,26 @@ +From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001 +From: Sebastian Hahn <sebastian(a)torproject.org> +Date: Wed, 25 Apr 2012 23:58:47 +0200 +Subject: [PATCH] Fix openssl 1.0.1a compile + +--- + crypto/evp/e_rc4_hmac_md5.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c +index 3f32b25..e65380d 100644 +--- a/crypto/evp/e_rc4_hmac_md5.c ++++ b/crypto/evp/e_rc4_hmac_md5.c +@@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, + #if !defined(OPENSSL_NO_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) || \ +- defined(__INTEL__) ) ++ defined(__INTEL__) ) && \ ++ !(defined(__APPLE__) && defined(__MACH__)) + #define STITCHED_CALL + #endif + +-- +1.7.10 +

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.2] OSX: Fix 64bit compile of openssl
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch new file mode 100644 index 0000000..3fbd39c --- /dev/null +++ b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch @@ -0,0 +1,26 @@ +From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001 +From: Sebastian Hahn <sebastian(a)torproject.org> +Date: Wed, 25 Apr 2012 23:58:47 +0200 +Subject: [PATCH] Fix openssl 1.0.1a compile + +--- + crypto/evp/e_rc4_hmac_md5.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c +index 3f32b25..e65380d 100644 +--- a/crypto/evp/e_rc4_hmac_md5.c ++++ b/crypto/evp/e_rc4_hmac_md5.c +@@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, + #if !defined(OPENSSL_NO_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) || \ +- defined(__INTEL__) ) ++ defined(__INTEL__) ) && \ ++ !(defined(__APPLE__) && defined(__MACH__)) + #define STITCHED_CALL + #endif + +-- +1.7.10 +

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit 6648eafc126d163173dc8b7b204046611f085d36 Merge: b8574c2 f2d9940 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 25 21:01:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] Merge branch 'openssl-1.0.1a-fix' into maint-2.2
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit f2d994010efe2a8189236babb06b6da26c876a04 Merge: e6f9b2d af6f55b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 25 21:01:25 2012 -0300 Merge branch 'openssl-1.0.1a-fix' into maint-2.2 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] OSX: Fix 64bit compile of openssl
by erinn＠torproject.org 26 Apr '12

26 Apr '12

commit af6f55bb51860cab72ef489f19996f55af23645c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 26 00:00:02 2012 +0200 OSX: Fix 64bit compile of openssl --- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 ++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch new file mode 100644 index 0000000..3fbd39c --- /dev/null +++ b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch @@ -0,0 +1,26 @@ +From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001 +From: Sebastian Hahn <sebastian(a)torproject.org> +Date: Wed, 25 Apr 2012 23:58:47 +0200 +Subject: [PATCH] Fix openssl 1.0.1a compile + +--- + crypto/evp/e_rc4_hmac_md5.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c +index 3f32b25..e65380d 100644 +--- a/crypto/evp/e_rc4_hmac_md5.c ++++ b/crypto/evp/e_rc4_hmac_md5.c +@@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, + #if !defined(OPENSSL_NO_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) || \ +- defined(__INTEL__) ) ++ defined(__INTEL__) ) && \ ++ !(defined(__APPLE__) && defined(__MACH__)) + #define STITCHED_CALL + #endif + +-- +1.7.10 +

1 0

[flashproxy/master] Use a 10MB file in the throughput test.
by dcf＠torproject.org 25 Apr '12

25 Apr '12

commit 48e645675d8fabd2ebcbfa91f0a6037cf8511b63 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 9 09:54:52 2012 -0700 Use a 10MB file in the throughput test. --- experiments/throughput/throughput.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index fc61fb5..8befe65 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -42,7 +42,7 @@ stop() { trap stop EXIT echo "Create data file." -dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=100 2>/dev/null || exit +dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=10 2>/dev/null || exit echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 &

1 0

[flashproxy/master] Update switching experiment for JS proxy.
by dcf＠torproject.org 25 Apr '12

25 Apr '12

commit a9dce418b568aee67076abb5727c2dcbae73e835 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 17:11:15 2012 -0700 Update switching experiment for JS proxy. --- experiments/switching/local-http-alternating.sh | 7 ++++--- experiments/switching/local-http-constant.sh | 11 ++++++++--- experiments/switching/remote-tor-alternating.sh | 5 +++-- experiments/switching/remote-tor-constant.sh | 5 +++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index c2593a4..0d3eb08 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" +PROXY_URL="http://127.0.0.1:8000/embed.html?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" @@ -41,7 +41,7 @@ PIDS_TO_KILL+=($!) visible_sleep 5 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py --facilitator 127.0.0.1 >/dev/null & +"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null & PIDS_TO_KILL+=($!) visible_sleep 1 @@ -54,8 +54,9 @@ PIDS_TO_KILL+=($!) visible_sleep 2 echo "Start socat." -"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & +"$FLASHPROXY_DIR"/connector.py >/dev/null & PIDS_TO_KILL+=($!) +echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 2 diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index bc821a3..f7a8aba 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" +PROXY_URL="http://127.0.0.1:8000/embed.html?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" @@ -35,14 +35,19 @@ echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 & PIDS_TO_KILL+=($!) +echo "Start websockify." +"$WEBSOCKIFY" -v 8001 127.0.0.1:8000 >/dev/null & +PIDS_TO_KILL+=($!) + echo "Start facilitator." -"$FLASHPROXY_DIR"/facilitator.py -d --relay 127.0.0.1:8000 >/dev/null & +"$FLASHPROXY_DIR"/facilitator.py -d --relay 127.0.0.1:8001 >/dev/null & PIDS_TO_KILL+=($!) visible_sleep 5 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py --facilitator 127.0.0.1 >/dev/null & +"$FLASHPROXY_DIR"/connector.py >/dev/null & PIDS_TO_KILL+=($!) +echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start browser." diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 5d1804b..0ab4511 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" +PROXY_URL="http://127.0.0.1:8000/embed.html?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" @@ -38,8 +38,9 @@ PIDS_TO_KILL+=($!) visible_sleep 5 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py --facilitator 127.0.0.1 >/dev/null & +"$FLASHPROXY_DIR"/connector.py >/dev/null & PIDS_TO_KILL+=($!) +echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start Tor." diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 01c8da2..0b16fec 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" +PROXY_URL="http://127.0.0.1:8000/embed.html?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" @@ -37,8 +37,9 @@ PIDS_TO_KILL+=($!) visible_sleep 5 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py --facilitator 127.0.0.1 >/dev/null & +"$FLASHPROXY_DIR"/connector.py >/dev/null & PIDS_TO_KILL+=($!) +echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start Tor."

1 0