December 2011 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] bump all tbbs to 2.2.35-1 for new tor release
by erinn＠torproject.org 16 Dec '11

16 Dec '11

commit 8abea369ae8593fd32ea590e36b76eee52ab1c99 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 16 05:53:03 2011 +0000 bump all tbbs to 2.2.35-1 for new tor release --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/recommended-versions | 15 +++++---------- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 11 files changed, 54 insertions(+), 26 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8be6ca9..308a7a3 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index e5a67ad..5d37e23 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 4329309..d874e72 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 8.0.1 \_ Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 963da78..a8f9862 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f53941b..817f32a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2cb0cda..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,7 @@ [ -"2.2.34-2-Linux-i686", -"2.2.34-2-Linux-x86_64", -"2.2.34-2-MacOS-i386", -"2.2.34-2-MacOS-x86_64", -"2.2.34-2-Windows", -"2.2.34-3-Linux-i686", -"2.2.34-3-Linux-x86_64", -"2.2.34-3-MacOS-i386", -"2.2.34-3-MacOS-x86_64", -"2.2.34-3-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ] diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 81c5f1c..c2b6ca7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,18 +1,18 @@ #!/usr/bin/make -RELEASE_VER=2.2.34 +RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 FIREFOX_VER=8.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2 +NOSCRIPT_VER=2.2.3 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 -TOR_VER=0.2.2.34 -TORBUTTON_VER=1.4.4.1 +TOR_VER=0.2.2.35 +TORBUTTON_VER=1.4.5 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8f21e98..55447cc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 7dd0125..429c50f 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=linux + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:12 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=linux * Update Firefox to 8.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6a4d198..6c88cc0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=osx + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:02 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=osx * Update Firefox to 8.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 1bb726c..bf0ba98 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=windows + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:07 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=windows * Update Firefox to 8.0.1

1 0

[torbrowser/master] bump all tbbs to 2.2.35-1 for new tor release
by erinn＠torproject.org 16 Dec '11

16 Dec '11

commit 8abea369ae8593fd32ea590e36b76eee52ab1c99 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 16 05:53:03 2011 +0000 bump all tbbs to 2.2.35-1 for new tor release --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/recommended-versions | 15 +++++---------- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 11 files changed, 54 insertions(+), 26 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8be6ca9..308a7a3 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index e5a67ad..5d37e23 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 4329309..d874e72 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.34 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 8.0.1 \_ Firefox (Aurora) 8.0.1 - \_ Torbutton 1.4.4.1 - |_ NoScript 2.2 + \_ Torbutton 1.4.5 + |_ NoScript 2.2.3 |_ HTTPS-Everywhere 1.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 963da78..a8f9862 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f53941b..817f32a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2cb0cda..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,7 @@ [ -"2.2.34-2-Linux-i686", -"2.2.34-2-Linux-x86_64", -"2.2.34-2-MacOS-i386", -"2.2.34-2-MacOS-x86_64", -"2.2.34-2-Windows", -"2.2.34-3-Linux-i686", -"2.2.34-3-Linux-x86_64", -"2.2.34-3-MacOS-i386", -"2.2.34-3-MacOS-x86_64", -"2.2.34-3-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ] diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 81c5f1c..c2b6ca7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,18 +1,18 @@ #!/usr/bin/make -RELEASE_VER=2.2.34 +RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 FIREFOX_VER=8.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2 +NOSCRIPT_VER=2.2.3 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 -TOR_VER=0.2.2.34 -TORBUTTON_VER=1.4.4.1 +TOR_VER=0.2.2.35 +TORBUTTON_VER=1.4.5 VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8f21e98..55447cc 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=3 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 7dd0125..429c50f 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=linux + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:12 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=linux * Update Firefox to 8.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6a4d198..6c88cc0 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=osx + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:02 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=osx * Update Firefox to 8.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 1bb726c..bf0ba98 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.35-1); suite=windows + + * Update Tor to 0.2.2.35 + * Update NoScript to 2.2.3 + * Update Torbutton to 1.4.5 + * New Firefox patches + - Disable SSL Session ID tracking + - Provide an observer event to close persistent connections + + -- Erinn Clark <erinn(a)torproject.org> Fri Dec 16 03:56:07 GMT 2011 + Tor Browser Bundle (2.2.34-3); suite=windows * Update Firefox to 8.0.1

1 0

[tor/release-0.2.1] Add a fix for the buf_pullup bug that Vektor reported
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit 9d0777839be6642954a4c064c819d406d8bb7cb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 14 16:38:43 2011 -0500 Add a fix for the buf_pullup bug that Vektor reported --- changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/buffer_bug b/changes/buffer_bug new file mode 100644 index 0000000..634f609 --- /dev/null +++ b/changes/buffer_bug @@ -0,0 +1,7 @@ + + o Major bugfixes: + - Fix a heap overflow bug that could occur when trying to pull + data into the first chunk of a buffer, when that chunk had + already had some data drained from it. Fixes CVE-2011-2778; + bugfix on 0.2.0.16-alpha. Reported by "Vektor". + diff --git a/src/or/buffers.c b/src/or/buffers.c index 7103746..5701604 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -375,9 +375,10 @@ buf_pullup(buf_t *buf, size_t bytes, int nulterminate) if (buf->head->memlen >= capacity) { /* We don't need to grow the first chunk, but we might need to repack it.*/ - if (CHUNK_REMAINING_CAPACITY(buf->head) < capacity-buf->datalen) + size_t needed = capacity - buf->head->datalen; + if (CHUNK_REMAINING_CAPACITY(buf->head) < needed) chunk_repack(buf->head); - tor_assert(CHUNK_REMAINING_CAPACITY(buf->head) >= capacity-buf->datalen); + tor_assert(CHUNK_REMAINING_CAPACITY(buf->head) >= needed); } else { chunk_t *newhead; size_t newsize;

1 0

[tor/release-0.2.1] Changelog and blurb for 0.2.1.32
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit aea35fbb1bae0a6451c1f07b5d09c766dd38ec42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 11:38:00 2011 -0500 Changelog and blurb for 0.2.1.32 --- ChangeLog | 13 ++++++++++++- changes/buffer_bug | 7 ------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e75785..912a3d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,21 @@ -Changes in version 0.2.1.32 - 201?-??-?? +Changes in version 0.2.1.32 - 2011-12-16 + Tor 0.2.1.32 backports important security and privacy fixes for + oldstable. This release is intended only for package maintainers and + others who cannot use the 0.2.2 stable series. All others should be + using Tor 0.2.2.x or newer. + + The Tor 0.2.1.x series will reach formal end-of-life some time in + early 2012, when we will stop releasing patches for it. o Major bugfixes (also included in 0.2.2.x): - Correctly sanity-check that we don't underflow on a memory allocation (and then assert) for hidden service introduction point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410; bugfix on 0.2.1.5-alpha. + - Fix a heap overflow bug that could occur when trying to pull + data into the first chunk of a buffer, when that chunk had + already had some data drained from it. Fixes CVE-2011-2778; + bugfix on 0.2.0.16-alpha. Reported by "Vektor". o Minor features: - Update to the December 6 2011 Maxmind GeoLite Country database. diff --git a/changes/buffer_bug b/changes/buffer_bug deleted file mode 100644 index 634f609..0000000 --- a/changes/buffer_bug +++ /dev/null @@ -1,7 +0,0 @@ - - o Major bugfixes: - - Fix a heap overflow bug that could occur when trying to pull - data into the first chunk of a buffer, when that chunk had - already had some data drained from it. Fixes CVE-2011-2778; - bugfix on 0.2.0.16-alpha. Reported by "Vektor". -

1 0

[tor/release-0.2.1] Copy 0.2.1.32 changelog entry into releasenotes
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit fbfc8e032fb6fb6ba82583c09611caf491de66fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 13:17:05 2011 -0500 Copy 0.2.1.32 changelog entry into releasenotes --- ReleaseNotes | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index e3de631..6a538e5 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,29 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.1.32 - 2011-12-16 + Tor 0.2.1.32 backports important security and privacy fixes for + oldstable. This release is intended only for package maintainers and + others who cannot use the 0.2.2 stable series. All others should be + using Tor 0.2.2.x or newer. + + The Tor 0.2.1.x series will reach formal end-of-life some time in + early 2012, when we will stop releasing patches for it. + + o Major bugfixes (also included in 0.2.2.x): + - Correctly sanity-check that we don't underflow on a memory + allocation (and then assert) for hidden service introduction + point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410; + bugfix on 0.2.1.5-alpha. + - Fix a heap overflow bug that could occur when trying to pull + data into the first chunk of a buffer, when that chunk had + already had some data drained from it. Fixes CVE-2011-2778; + bugfix on 0.2.0.16-alpha. Reported by "Vektor". + + o Minor features: + - Update to the December 6 2011 Maxmind GeoLite Country database. + + Changes in version 0.2.1.31 - 2011-10-26 Tor 0.2.1.31 backports important security and privacy fixes for oldstable. This release is intended only for package maintainers and

1 0

[tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit 03c7d9e992f250a484d4770af12271e742a3bd81 Merge: 5eff44c 9d07778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 11:35:23 2011 -0500 Merge branch 'maint-0.2.1' into release-0.2.1 changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.1] Bump the version to 0.2.1.32
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit c30ac81d40e81d3d0136a83612a151d930d57b0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 12:01:07 2011 -0500 Bump the version to 0.2.1.32 --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index f654361..202b2f5 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.31) +AM_INIT_AUTOMAKE(tor, 0.2.1.32) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index efb3208..573510e 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.31" +!define VERSION "0.2.1.32" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 12af228..6f3e218 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.31" +#define VERSION "0.2.1.32"

1 0

[tor/release-0.2.2] Add a fix for the buf_pullup bug that Vektor reported
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit 9d0777839be6642954a4c064c819d406d8bb7cb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 14 16:38:43 2011 -0500 Add a fix for the buf_pullup bug that Vektor reported --- changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/buffer_bug b/changes/buffer_bug new file mode 100644 index 0000000..634f609 --- /dev/null +++ b/changes/buffer_bug @@ -0,0 +1,7 @@ + + o Major bugfixes: + - Fix a heap overflow bug that could occur when trying to pull + data into the first chunk of a buffer, when that chunk had + already had some data drained from it. Fixes CVE-2011-2778; + bugfix on 0.2.0.16-alpha. Reported by "Vektor". + diff --git a/src/or/buffers.c b/src/or/buffers.c index 7103746..5701604 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -375,9 +375,10 @@ buf_pullup(buf_t *buf, size_t bytes, int nulterminate) if (buf->head->memlen >= capacity) { /* We don't need to grow the first chunk, but we might need to repack it.*/ - if (CHUNK_REMAINING_CAPACITY(buf->head) < capacity-buf->datalen) + size_t needed = capacity - buf->head->datalen; + if (CHUNK_REMAINING_CAPACITY(buf->head) < needed) chunk_repack(buf->head); - tor_assert(CHUNK_REMAINING_CAPACITY(buf->head) >= capacity-buf->datalen); + tor_assert(CHUNK_REMAINING_CAPACITY(buf->head) >= needed); } else { chunk_t *newhead; size_t newsize;

1 0

[tor/release-0.2.1] Tweak changelog a little
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit 887bddb7e7323334484c9651ae116e3d28e7b217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 14:23:21 2011 -0500 Tweak changelog a little --- ChangeLog | 2 +- ReleaseNotes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 912a3d9..8a8f7e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Changes in version 0.2.1.32 - 2011-12-16 using Tor 0.2.2.x or newer. The Tor 0.2.1.x series will reach formal end-of-life some time in - early 2012, when we will stop releasing patches for it. + early 2012; we will stop releasing patches for it then. o Major bugfixes (also included in 0.2.2.x): - Correctly sanity-check that we don't underflow on a memory diff --git a/ReleaseNotes b/ReleaseNotes index 6a538e5..f7a421d 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -10,7 +10,7 @@ Changes in version 0.2.1.32 - 2011-12-16 using Tor 0.2.2.x or newer. The Tor 0.2.1.x series will reach formal end-of-life some time in - early 2012, when we will stop releasing patches for it. + early 2012; we will stop releasing patches for it then. o Major bugfixes (also included in 0.2.2.x): - Correctly sanity-check that we don't underflow on a memory

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by nickm＠torproject.org 16 Dec '11

16 Dec '11

commit 2c70ca0e944a086d03b92d978c957a5de90d00c8 Merge: ed46539 562c974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 11:38:40 2011 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/buffer_bug | 7 +++++++ src/or/buffers.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0