- tor-commits - lists.torproject.org

[tor/master] Fix the bench_{aes, dmap} test functions to work with TT
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 38123ffa23355d4607987a9fd0dc7b0595e787a7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 9 10:54:00 2011 +0100 Fix the bench_{aes,dmap} test functions to work with TT TT expects them to be named test_bench_{aes,dmap}. Also change the DISABLED macro to reflect that. --- changes/test_bench | 5 +++++ src/test/test.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/test_bench b/changes/test_bench new file mode 100644 index 0000000..8ae895b --- /dev/null +++ b/changes/test_bench @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Rename the bench_{aes,dmap} functions to test_*, so that tinytest can + pick them up when the tests aren't disabled. Bugfix on 0.2.2.4-alpha + which introduced tinytest. + diff --git a/src/test/test.c b/src/test/test.c index aca7f10..185bf5a 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1267,7 +1267,7 @@ test_policies(void) /** Run AES performance benchmarks. */ static void -bench_aes(void) +test_bench_aes(void) { int len, i; char *b1, *b2; @@ -1299,7 +1299,7 @@ bench_aes(void) /** Run digestmap_t performance benchmarks. */ static void -bench_dmap(void) +test_bench_dmap(void) { smartlist_t *sl = smartlist_create(); smartlist_t *sl2 = smartlist_create(); @@ -1899,7 +1899,7 @@ const struct testcase_setup_t legacy_setup = { { #group "_" #name, legacy_test_helper, 0, &legacy_setup, \ test_ ## group ## _ ## name } #define DISABLED(name) \ - { #name, legacy_test_helper, TT_SKIP, &legacy_setup, name } + { #name, legacy_test_helper, TT_SKIP, &legacy_setup, test_ ## name } #define FORK(name) \ { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_ ## name }

1 0

[tor/master] Remove the torint.h include from aes.h
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit a2ecf131f335132518a94a9a2cd831f8bd66bf56 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 9 11:06:37 2011 +0100 Remove the torint.h include from aes.h This hasn't been needed for a while, there's nothing in aes.h now that would need uint* stuff. --- src/common/aes.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/common/aes.h b/src/common/aes.h index eb633db..b259194 100644 --- a/src/common/aes.h +++ b/src/common/aes.h @@ -13,8 +13,6 @@ * \brief Headers for aes.c */ -#include "torint.h" - struct aes_cnt_cipher; typedef struct aes_cnt_cipher aes_cnt_cipher_t;

1 0

[tor/master] Fixed buffer bounds check bug in tor_addr_to_str
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 930eed21c37d94c2f9c2b2a0f66135f554ce5079 Author: Anders Sundman <anders(a)4zm.org> Date: Fri Nov 11 07:53:58 2011 +0100 Fixed buffer bounds check bug in tor_addr_to_str --- src/common/address.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index b41456f..54ea5df 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -350,15 +350,21 @@ tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len, int decorate) switch (tor_addr_family(addr)) { case AF_INET: - if (len<3) + /* Shortest addr x.x.x.x + \0 */ + if (len < 8) return NULL; - ptr = tor_inet_ntop(AF_INET, &addr->addr.in_addr, dest, len); + ptr = tor_inet_ntop(AF_INET, &addr->addr.in_addr, dest, len); break; case AF_INET6: + /* Shortest addr [ :: ] + \0 */ + if (len < (3 + (decorate ? 2 : 0))) + return NULL; + if (decorate) ptr = tor_inet_ntop(AF_INET6, &addr->addr.in6_addr, dest+1, len-2); else ptr = tor_inet_ntop(AF_INET6, &addr->addr.in6_addr, dest, len); + if (ptr && decorate) { *dest = '['; memcpy(dest+strlen(dest), "]", 2);

1 0

[tor/master] Merge remote-tracking branch '4ZM/topic/test/4434_address'
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit d348cfdbdfa2c54e646e95e3690d8f6848e779b2 Merge: 8d6ce16 ca1e88a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 11 11:07:29 2011 -0500 Merge remote-tracking branch '4ZM/topic/test/4434_address' src/common/address.c | 10 +++++- src/common/compat.c | 4 +- src/test/test_addr.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 78 insertions(+), 7 deletions(-)

1 0

[tor/master] Unit tests for tor_addr_to_str
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit ca1e88a0db2029ca9b1603d27a2c42fa75583790 Author: Anders Sundman <anders(a)4zm.org> Date: Fri Nov 11 07:55:20 2011 +0100 Unit tests for tor_addr_to_str --- src/test/test_addr.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index ec59e5b..b879efd 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -394,7 +394,15 @@ test_addr_ip6_helpers(void) test_addr_compare_masked("0::2:2:1", <, "0::8000:2:1", 81); test_addr_compare_masked("0::2:2:1", ==, "0::8000:2:1", 80); - /* Test decorated addr_to_string. */ + /* Test undecorated tor_addr_to_str */ + test_eq(AF_INET6, tor_addr_parse(&t1, "[123:45:6789::5005:11]")); + p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 0); + test_streq(p1, "123:45:6789::5005:11"); + test_eq(AF_INET, tor_addr_parse(&t1, "18.0.0.1")); + p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 0); + test_streq(p1, "18.0.0.1"); + + /* Test decorated tor_addr_to_str */ test_eq(AF_INET6, tor_addr_parse(&t1, "[123:45:6789::5005:11]")); p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1); test_streq(p1, "[123:45:6789::5005:11]"); @@ -402,6 +410,32 @@ test_addr_ip6_helpers(void) p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1); test_streq(p1, "18.0.0.1"); + /* Test buffer bounds checking of tor_addr_to_str */ + test_eq(AF_INET6, tor_addr_parse(&t1, "::")); /* 2 + \0 */ + test_eq_ptr(tor_addr_to_str(buf, &t1, 2, 0), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 3, 0), "::"); + test_eq_ptr(tor_addr_to_str(buf, &t1, 4, 1), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 5, 1), "[::]"); + + test_eq(AF_INET6, tor_addr_parse(&t1, "2000::1337")); /* 10 + \0 */ + test_eq_ptr(tor_addr_to_str(buf, &t1, 10, 0), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 11, 0), "2000::1337"); + test_eq_ptr(tor_addr_to_str(buf, &t1, 12, 1), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 13, 1), "[2000::1337]"); + + test_eq(AF_INET, tor_addr_parse(&t1, "1.2.3.4")); /* 7 + \0 */ + test_eq_ptr(tor_addr_to_str(buf, &t1, 7, 0), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 8, 0), "1.2.3.4"); + + test_eq(AF_INET, tor_addr_parse(&t1, "255.255.255.255")); /* 15 + \0 */ + test_eq_ptr(tor_addr_to_str(buf, &t1, 15, 0), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 16, 0), "255.255.255.255"); + test_eq_ptr(tor_addr_to_str(buf, &t1, 15, 1), NULL); /* too short buf */ + test_streq(tor_addr_to_str(buf, &t1, 16, 1), "255.255.255.255"); + + t1.family = AF_UNSPEC; + test_eq_ptr(tor_addr_to_str(buf, &t1, sizeof(buf), 0), NULL); + /* Test tor_addr_parse_PTR_name */ i = tor_addr_parse_PTR_name(&t1, "Foobar.baz", AF_UNSPEC, 0); test_eq(0, i);

1 0

[tor/master] Changes file for patches from 4ZM
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 613ff5698a3cd17a2f245fabf5c9731e856bc296 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 11 11:11:15 2011 -0500 Changes file for patches from 4ZM --- changes/bug4434 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug4434 b/changes/bug4434 new file mode 100644 index 0000000..d602088 --- /dev/null +++ b/changes/bug4434 @@ -0,0 +1,9 @@ + o Minor bugfixes: + - Fix some (not actually triggerable) buffer size checks in usage of + tor_inet_ntop. Fixes bug 4434; bugfix on Tor 0.2.0.1-alpha. Patch + by Anders Sundman. + + o Testing: + - Numerous new unit tests for functions in util.c and address.c by + Anders Sundman. +

1 0

[tor/master] Fixed of-by-one error in tor_inet_ntop
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 01e1dc0e6227a8d7e107e41cf19ac9c68d47e7b7 Author: Anders Sundman <anders(a)4zm.org> Date: Fri Nov 11 07:47:00 2011 +0100 Fixed of-by-one error in tor_inet_ntop The of-by-one error could lead to 1 byte buffer over runs IPv6 for addresses. --- src/common/compat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 2cf7f46..ba49af7 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1632,7 +1632,7 @@ tor_inet_ntop(int af, const void *src, char *dst, size_t len) addr->s6_addr[12], addr->s6_addr[13], addr->s6_addr[14], addr->s6_addr[15]); } - if (strlen(buf) > len) + if ((strlen(buf) + 1) > len) /* +1 for \0 */ return NULL; strlcpy(dst, buf, len); return dst; @@ -1673,7 +1673,7 @@ tor_inet_ntop(int af, const void *src, char *dst, size_t len) } } *cp = '\0'; - if (strlen(buf) > len) + if ((strlen(buf) + 1) > len) /* +1 for \0 */ return NULL; strlcpy(dst, buf, len); return dst;

1 0

[tor/master] Unit tests for tor_inet_ntop
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 8c7658dfdf651e629da11c46affbebcd799b6a59 Author: Anders Sundman <anders(a)4zm.org> Date: Fri Nov 11 07:49:41 2011 +0100 Unit tests for tor_inet_ntop --- src/test/test_addr.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 58e3e3d..ec59e5b 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -53,9 +53,17 @@ test_addr_basic(void) char tmpbuf[TOR_ADDR_BUF_LEN]; const char *ip = "176.192.208.224"; struct in_addr in; - tor_inet_pton(AF_INET, ip, &in); - tor_inet_ntop(AF_INET, &in, tmpbuf, sizeof(tmpbuf)); + + /* good round trip */ + test_eq(tor_inet_pton(AF_INET, ip, &in), 1); + test_eq_ptr(tor_inet_ntop(AF_INET, &in, tmpbuf, sizeof(tmpbuf)), &tmpbuf); test_streq(tmpbuf, ip); + + /* just enough buffer length */ + test_streq(tor_inet_ntop(AF_INET, &in, tmpbuf, strlen(ip) + 1), ip); + + /* too short buffer */ + test_eq_ptr(tor_inet_ntop(AF_INET, &in, tmpbuf, strlen(ip)), NULL); } done: @@ -179,6 +187,29 @@ test_addr_ip6_helpers(void) // struct in_addr b1, b2; /* Test tor_inet_ntop and tor_inet_pton: IPv6 */ + { + const char *ip = "2001::1234"; + const char *ip_ffff = "::ffff:192.168.1.2"; + + /* good round trip */ + test_eq(tor_inet_pton(AF_INET6, ip, &a1), 1); + test_eq_ptr(tor_inet_ntop(AF_INET6, &a1, buf, sizeof(buf)), &buf); + test_streq(buf, ip); + + /* good round trip - ::ffff:0:0 style */ + test_eq(tor_inet_pton(AF_INET6, ip_ffff, &a2), 1); + test_eq_ptr(tor_inet_ntop(AF_INET6, &a2, buf, sizeof(buf)), &buf); + test_streq(buf, ip_ffff); + + /* just long enough buffer (remember \0) */ + test_streq(tor_inet_ntop(AF_INET6, &a1, buf, strlen(ip)+1), ip); + test_streq(tor_inet_ntop(AF_INET6, &a2, buf, strlen(ip_ffff)+1), + ip_ffff); + + /* too short buffer (remember \0) */ + test_eq_ptr(tor_inet_ntop(AF_INET6, &a1, buf, strlen(ip)), NULL); + test_eq_ptr(tor_inet_ntop(AF_INET6, &a2, buf, strlen(ip_ffff)), NULL); + } /* ==== Converting to and from sockaddr_t. */ sin = (struct sockaddr_in *)&sa_storage;

1 0

r25201: {website} the user manual is now available in dutch, french and german (website/trunk/docs/en)
by Runa Sandvik 11 Nov '11

11 Nov '11

Author: runa Date: 2011-11-11 16:06:53 +0000 (Fri, 11 Nov 2011) New Revision: 25201 Modified: website/trunk/docs/en/short-user-manual.wml Log: the user manual is now available in dutch, french and german Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-09 02:45:31 UTC (rev 25200) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-11 16:06:53 UTC (rev 25201) @@ -22,6 +22,9 @@ <p>The user manual is available in the following languages:</p> <ul> <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_de.xhtml">German</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> </ul> </div>

1 0

[tor/master] Unit test for hex_str func
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit fa9aef6eec699f2c9c913467ea3032205d1a2a73 Author: Anders Sundman <anders(a)4zm.org> Date: Mon Oct 31 23:36:35 2011 +0100 Unit test for hex_str func Note: Too long input is undefined by contract. That behaviour should not be asserted in test. --- src/test/test_util.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6603ab0..e9240e1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -409,6 +409,20 @@ test_util_strmisc(void) SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_free(sl); } + + /* Test hex_str */ + { + char binary_data[64]; + size_t i; + for (i = 0; i < sizeof(binary_data); ++i) + binary_data[i] = i; + test_streq(hex_str(binary_data, 0), ""); + test_streq(hex_str(binary_data, 1), "00"); + test_streq(hex_str(binary_data, 17), "000102030405060708090A0B0C0D0E0F10"); + test_streq(hex_str(binary_data, 32), + "000102030405060708090A0B0C0D0E0F" + "101112131415161718191A1B1C1D1E1F"); + } done: ; }

1 0