August 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] give it a blurb and a date
by arma＠torproject.org 10 Aug '13

10 Aug '13

commit addbe6f2f3c89ed5bfd9c0ce9b4640c82e3e8e14 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 10 18:06:03 2013 -0400 give it a blurb and a date --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34aa04a..a3fad56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Changes in version 0.2.4.16-rc - 2013-08-0? +Changes in version 0.2.4.16-rc - 2013-08-10 + Tor 0.2.4.16-rc is the second release candidate for the Tor 0.2.4.x + series. It fixes several crash bugs in the 0.2.4 branch. + o Major bugfixes: - Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200;

1 0

[tor/release-0.2.4] fold in change stanza
by arma＠torproject.org 10 Aug '13

10 Aug '13

commit c2150628fd819f8a6679e9717c659d9468c27a8a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 10 18:04:17 2013 -0400 fold in change stanza --- ChangeLog | 5 +++++ changes/v3_intro_len | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e741732..34aa04a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ Changes in version 0.2.4.16-rc - 2013-08-0? - Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200; bugfix on 0.2.0.3-alpha. + - Fix an uninitialized read that could in some cases lead to a remote + crash while parsing INTRODUCE 1 cells. Bugfix on 0.2.4.1-alpha. + Anybody running a hidden service on the experimental 0.2.4.x + branch should upgrade. (This is, so far as we know, unrelated to + the recent news.) - Avoid an assertion failure when processing DNS replies without the answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha. - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on diff --git a/changes/v3_intro_len b/changes/v3_intro_len deleted file mode 100644 index fbe39bc..0000000 --- a/changes/v3_intro_len +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes: - - - Fix an uninitialized read that could (in some cases) lead to a remote - crash while parsing INTRODUCE 1 cells. (This is, so far as we know, - unrelated to the recent news.) Fixes bug XXX; bugfix on - 0.2.4.1-alpha. Anybody running a hidden service on the experimental - 0.2.4.x branch should upgrade. -

1 0

[tor/release-0.2.4] Fix an uninitialized-read when parsing v3 introduction requests.
by arma＠torproject.org 10 Aug '13

10 Aug '13

commit d5cfbf96a2dbbee4501da92d5a21d0c66732ae24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:40:33 2013 -0400 Fix an uninitialized-read when parsing v3 introduction requests. Fortunately, later checks mean that uninitialized data can't get sent to the network by this bug. Unfortunately, reading uninitialized heap *can* (in some cases, with some allocators) cause a crash if you get unlucky and go off the end of a page. Found by asn. Bugfix on 0.2.4.1-alpha. --- changes/v3_intro_len | 8 ++++++++ src/or/rendservice.c | 10 ++-------- src/or/rendservice.h | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changes/v3_intro_len b/changes/v3_intro_len new file mode 100644 index 0000000..fbe39bc --- /dev/null +++ b/changes/v3_intro_len @@ -0,0 +1,8 @@ + o Major bugfixes: + + - Fix an uninitialized read that could (in some cases) lead to a remote + crash while parsing INTRODUCE 1 cells. (This is, so far as we know, + unrelated to the recent news.) Fixes bug XXX; bugfix on + 0.2.4.1-alpha. Anybody running a hidden service on the experimental + 0.2.4.x branch should upgrade. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index a8f63dd..00bca17 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1898,8 +1898,8 @@ rend_service_parse_intro_for_v3( } } - /* Check that we actually have everything up to the timestamp */ - if (plaintext_len < (size_t)(ts_offset)) { + /* Check that we actually have everything up through the timestamp */ + if (plaintext_len < (size_t)(ts_offset)+4) { if (err_msg_out) { tor_asprintf(err_msg_out, "truncated plaintext of encrypted parted of " @@ -1923,12 +1923,6 @@ rend_service_parse_intro_for_v3( } /* - * Apparently we don't use the timestamp any more, but might as well copy - * over just in case we ever care about it. - */ - intro->u.v3.timestamp = ntohl(get_uint32(buf + ts_offset)); - - /* * From here on, the format is as in v2, so we call the v2 parser with * adjusted buffer and length. We are 4 + ts_offset octets in, but the * v2 parser expects to skip over a version byte at the start, so we diff --git a/src/or/rendservice.h b/src/or/rendservice.h index ff31ba6..caf88a3 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -56,8 +56,6 @@ struct rend_intro_cell_s { uint16_t auth_len; /* Auth data */ uint8_t *auth_data; - /* timestamp */ - uint32_t timestamp; /* Rendezvous point's IP address/port, identity digest and onion key */ extend_info_t *extend_info; } v3;

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 10 Aug '13

10 Aug '13

commit 42335972d5f73c18b59459201d80f4e769cc2a5b Merge: a2ea9df d5cfbf9 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 10 18:00:47 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/v3_intro_len | 8 ++++++++ src/or/rendservice.c | 10 ++-------- src/or/rendservice.h | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.2.4] Fix an uninitialized-read when parsing v3 introduction requests.
by arma＠torproject.org 10 Aug '13

10 Aug '13

commit d5cfbf96a2dbbee4501da92d5a21d0c66732ae24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 11:40:33 2013 -0400 Fix an uninitialized-read when parsing v3 introduction requests. Fortunately, later checks mean that uninitialized data can't get sent to the network by this bug. Unfortunately, reading uninitialized heap *can* (in some cases, with some allocators) cause a crash if you get unlucky and go off the end of a page. Found by asn. Bugfix on 0.2.4.1-alpha. --- changes/v3_intro_len | 8 ++++++++ src/or/rendservice.c | 10 ++-------- src/or/rendservice.h | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changes/v3_intro_len b/changes/v3_intro_len new file mode 100644 index 0000000..fbe39bc --- /dev/null +++ b/changes/v3_intro_len @@ -0,0 +1,8 @@ + o Major bugfixes: + + - Fix an uninitialized read that could (in some cases) lead to a remote + crash while parsing INTRODUCE 1 cells. (This is, so far as we know, + unrelated to the recent news.) Fixes bug XXX; bugfix on + 0.2.4.1-alpha. Anybody running a hidden service on the experimental + 0.2.4.x branch should upgrade. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index a8f63dd..00bca17 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1898,8 +1898,8 @@ rend_service_parse_intro_for_v3( } } - /* Check that we actually have everything up to the timestamp */ - if (plaintext_len < (size_t)(ts_offset)) { + /* Check that we actually have everything up through the timestamp */ + if (plaintext_len < (size_t)(ts_offset)+4) { if (err_msg_out) { tor_asprintf(err_msg_out, "truncated plaintext of encrypted parted of " @@ -1923,12 +1923,6 @@ rend_service_parse_intro_for_v3( } /* - * Apparently we don't use the timestamp any more, but might as well copy - * over just in case we ever care about it. - */ - intro->u.v3.timestamp = ntohl(get_uint32(buf + ts_offset)); - - /* * From here on, the format is as in v2, so we call the v2 parser with * adjusted buffer and length. We are 4 + ts_offset octets in, but the * v2 parser expects to skip over a version byte at the start, so we diff --git a/src/or/rendservice.h b/src/or/rendservice.h index ff31ba6..caf88a3 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -56,8 +56,6 @@ struct rend_intro_cell_s { uint16_t auth_len; /* Auth data */ uint8_t *auth_data; - /* timestamp */ - uint32_t timestamp; /* Rendezvous point's IP address/port, identity digest and onion key */ extend_info_t *extend_info; } v3;

1 0

[torbrowser/master] add the locale pref back to pound_tor.js. we need it for langpacks to work.
by erinn＠torproject.org 10 Aug '13

10 Aug '13

commit ab78b958e37e9f83189311c157970a0f39634f0d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 10 23:33:36 2013 +0200 add the locale pref back to pound_tor.js. we need it for langpacks to work. --- build-scripts/config/pound_tor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 026caab..585fdd5 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -50,6 +50,7 @@ pref("browser.display.max_font_count",10); pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); +pref("general.useragent.locale", "SHPONKA"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); pref("general.productSub.override", "20100101");

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 10 Aug '13

10 Aug '13

commit 346321ee3c51355b44130f275ab3acf8539fd577 Merge: 57fae9c 9ab5820 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 10 23:34:26 2013 +0200 Merge branch 'maint-2.4' build-scripts/config/pound_tor.js | 1 + build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-)

1 0

[torbrowser/maint-2.4] add the locale pref back to pound_tor.js. we need it for langpacks to work.
by erinn＠torproject.org 10 Aug '13

10 Aug '13

commit ab78b958e37e9f83189311c157970a0f39634f0d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 10 23:33:36 2013 +0200 add the locale pref back to pound_tor.js. we need it for langpacks to work. --- build-scripts/config/pound_tor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 026caab..585fdd5 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -50,6 +50,7 @@ pref("browser.display.max_font_count",10); pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); +pref("general.useragent.locale", "SHPONKA"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); pref("general.productSub.override", "20100101");

1 0

[torbrowser/maint-2.4] update bundle versions for pending release for stable and beta TBBs
by erinn＠torproject.org 10 Aug '13

10 Aug '13

commit 9ab5820d03a59fc328f24fa287f908efde8f06e1 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 10 23:34:05 2013 +0200 update bundle versions for pending release for stable and beta TBBs --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index e257dfc..d7c9a21 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d9bac1f..6000841 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..b66f1d7 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9307490..12eb827 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 76bd01e..813f656 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 68319de..f988e39 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] update bundle versions for pending release for stable and beta TBBs
by erinn＠torproject.org 10 Aug '13

10 Aug '13

commit 9ab5820d03a59fc328f24fa287f908efde8f06e1 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Aug 10 23:34:05 2013 +0200 update bundle versions for pending release for stable and beta TBBs --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index e257dfc..d7c9a21 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d9bac1f..6000841 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..b66f1d7 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9307490..12eb827 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 76bd01e..813f656 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 68319de..f988e39 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Windows ## Location of required libraries

1 0