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

[tor/maint-0.2.2] Make internal error check for unrecognized digest algorithm more robust
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit 246afc1b1ba8c81557307bfffa5291c91cc2c782 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 6 13:02:50 2011 -0400 Make internal error check for unrecognized digest algorithm more robust Fixes Coverity CID 479. --- changes/cov479 | 5 +++++ src/common/crypto.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/cov479 b/changes/cov479 new file mode 100644 index 0000000..afbaffc --- /dev/null +++ b/changes/cov479 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix internal bug-checking logic that was supposed to catch + failures in digest generation so that it will fail more robustly + if we ask for a nonexistent algorithm. Found by Coverity Scan. + Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479. diff --git a/src/common/crypto.c b/src/common/crypto.c index 851f11b..235bd88 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1663,6 +1663,10 @@ crypto_digest_get_digest(crypto_digest_env_t *digest, SHA256_Final(r, &tmpenv.d.sha2); break; default: + log_warn(LD_BUG, "Called with unknown algorithm %d", digest->algorithm); + /* If fragile_assert is not enabled, then we should at least not + * leak anything. */ + memset(r, 0xff, sizeof(r)); tor_fragile_assert(); break; }

1 0

[tor/master] Fix a couple of pluggable transport bugs
by nickm＠torproject.org 26 Oct '11

26 Oct '11

commit 34f12437d42bf8cf04763e851b54d6a96470e288 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Oct 26 16:49:24 2011 +0200 Fix a couple of pluggable transport bugs Fix coverity complaints 490, 491 and 492. Especially the one in parse_client_transport_line() could've been a remotely triggerable segfault, I think. --- src/or/config.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 40ce258..ec9d84b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4865,8 +4865,10 @@ parse_client_transport_line(const char *line, int validate_only) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); - SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); - smartlist_free(transport_list); + if (transport_list) { + SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); + smartlist_free(transport_list); + } return r; } @@ -5989,7 +5991,7 @@ validate_transports_in_state(or_state_t *state) for (line = state->TransportProxies ; line ; line = line->next) { tor_assert(!strcmp(line->key, "TransportProxy")); - if (!state_transport_line_is_valid(line->value)<0) + if (!state_transport_line_is_valid(line->value)) broken = 1; }

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 03fea3ae91281c8146e5a577e18ef46e81eb6e49 Merge: a518dd6 9af3a3c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:53:49 2011 -0400 Merge branch 'maint-0.2.2'

1 0

[tor/master] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/master] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/release-0.2.2] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 403264175d7371a3caaff52fb8723fc5fc1101b6 Merge: e76f626 9af3a3c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:49:41 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2

1 0

[tor/maint-0.2.2] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0