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

[tlsdate/debian-master] Only emit the label count once per hostname
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 04ae3c26aaf824d049bc269201842813b273113c Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 26 13:46:22 2013 -0700 Only emit the label count once per hostname --- src/tlsdate-helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 3e85bed..d6a9d4b 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -328,16 +328,15 @@ dns_label_count(char *label, char *delim) if (saveptr[0] != delim[0]) { label_count++; - verb ("V: label found; total label count: %d\n", label_count); } do { // Find all subsequent labels label_count++; saveptr_tmp = strtok_r(NULL, delim, &saveptr); - verb ("V: label found; total label count: %d\n", label_count); } while (NULL != saveptr_tmp); } + verb ("V: label found; total label count: %d\n", label_count); free(label_tmp); return label_count; }

1 0

[tlsdate/debian-master] after a certain point time_map should not be zero
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit a29d6956a440aa5a29f071076f29dce48fd61680 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 26 19:25:29 2013 -0700 after a certain point time_map should not be zero While porting tlsdate to Debian GNU/Hurd 7.0 I noticed that we would return zero as a valid server time. This happens as a result of some strange mmap and memcpy interactions on the Hurd. This could happen if the server was a false ticker or as a result of some other strange flukes, so we should never accept it and if time_map is zero, we should stop trying to use this server. We die when we encounter zero and it is probably the case that a smart administrator who wanted to mess with tlsdate users would return 32bits of zeros. We consider this useful as it is wrong and detectable as such. --- src/tlsdate-helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index d6a9d4b..311a377 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1189,6 +1189,10 @@ main(int argc, char **argv) #else server_time_s = ntohl (*time_map); #endif + // We should never have a time_map of zero here; + // It either stayed zero or we have a false ticker. + if (0 == time_map) + die ("child process failed to update time map; weird platform issues?\n"); munmap (time_map, sizeof (uint32_t)); verb ("V: server time %u (difference is about %d s) was fetched in %lld ms\n",

1 0

[tlsdate/debian-master] GNU/Hurd is not quite working yet
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit d0f69d755e2f7df72862bf4394f6b9b750625072 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 26 13:58:45 2013 -0700 GNU/Hurd is not quite working yet --- INSTALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 85ff0bc..285e147 100644 --- a/INSTALL +++ b/INSTALL @@ -15,7 +15,6 @@ tlsdate should build and work on the following Operating Systems: OpenBSD 5.2 Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT - Debian GNU/Hurd 7.0 (GNU-Mach 1.3.99-486-dbg/Hurd-0.3) Debian GNU/kFreeBSD 7.0 (8.2-1-amd64) tlsdate should build and might even work on the following Operating Systems: @@ -39,7 +38,8 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Currently porting is in progress or partially documented for: Plan9 (with APE) - + Debian GNU/Hurd 7.0 (GNU-Mach 1.3.99-486-dbg/Hurd-0.3) + Currently we report "server time 0 (difference is about 1367009757 s)" Building and install of tlsdate on GNU/Linux and FreeBSD: ./autogen.sh

1 0

[tlsdate/debian-master] tlsdated: remove rmrf()
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit ed1b336ca84f2f71c70f91d0d7aeb5a3ae4b547b Author: elly <elly(a)leptoquark.net> Date: Thu May 9 13:40:16 2013 -0400 tlsdated: remove rmrf() This function, while handy and presently used safely, could become dangerous if someone later adds a call to it that passes in attacker-controlled input. Therefore, hardcode calls to unlink(2) and rmdir(2) for the files tlsdated presently creates. This has the pleasant (?) side-effect of breaking unit-tests whenever tlsdated creates files we don't explicitly list on disk. BUG=None TEST=unit Signed-off-by: Elly Fong-Jones <ellyjones(a)chromium.org> --- src/tlsdated-unittest.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/tlsdated-unittest.c b/src/tlsdated-unittest.c index baed329..cb30313 100644 --- a/src/tlsdated-unittest.c +++ b/src/tlsdated-unittest.c @@ -27,14 +27,13 @@ FIXTURE_SETUP(tempdir) { ASSERT_NE(NULL, p); } -int rmrf(char *dir) { - char buf[256]; - snprintf(buf, sizeof(buf), "rm -rf %s", dir); - return system(buf); -} - FIXTURE_TEARDOWN(tempdir) { - ASSERT_EQ(0, rmrf(self->path)); + char buf[256]; + snprintf(buf, sizeof(buf), "%s/load", self->path); + unlink(buf); + snprintf(buf, sizeof(buf), "%s/save", self->path); + unlink(buf); + ASSERT_EQ(0, rmdir(self->path)); } int write_time(const char *path, time_t time) {

1 0

[tlsdate/debian-master] Fix from Paul Wouters to build
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 37b16839591b7825231b2a7cec8d47c46997b39f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue May 7 12:32:25 2013 -0700 Fix from Paul Wouters to build --- m4/ax_platform.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 4fcccb6..f3da57d 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -80,12 +80,12 @@ [*darwin*], [TARGET_OS_OSX="true" AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], - [*gnu*], - [TARGET_OS_GNUHURD="true" - AC_DEFINE([TARGET_OS_GNUHURD],[1],[Whether we build for GNU/Hurd])], [*linux*], [TARGET_OS_LINUX="true" - AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) + AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])], + [*gnu*], + [TARGET_OS_GNUHURD="true" + AC_DEFINE([TARGET_OS_GNUHURD],[1],[Whether we build for GNU/Hurd])]) AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"]) AM_CONDITIONAL([TARGET_MINGW],[test "x${TARGET_OS_MINGW}" = "xtrue"])

1 0

[tlsdate/debian-master] Add Elly as an author
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 8182b05e04aa2bc9f85ec97c4d710a8ee41b7654 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:46:42 2013 -0700 Add Elly as an author --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 43ce2ac..def276b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Jacob Appelbaum <jacob(a)appelbaum.net> Christian Grothoff <christian(a)grothoff.org> +Elly Jones <elly(a)leptoquark.net>

1 0

[tlsdate/debian-master] update policy per issue 109
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 3f69a2245fddf5c63e2325c30d68c324e32dcdda Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:51:29 2013 -0700 update policy per issue 109 --- apparmor-profile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apparmor-profile b/apparmor-profile index df278af..264de28 100644 --- a/apparmor-profile +++ b/apparmor-profile @@ -27,6 +27,7 @@ # Required for gethostbyname /etc/resolv.conf r, + /run/resolvconf/resolv.conf r, /etc/nsswitch.conf r, /etc/localtime r, /etc/nsswitch.conf r, @@ -88,6 +89,7 @@ # Required for gethostbyname /etc/resolv.conf r, + /run/resolvconf/resolv.conf r, /etc/nsswitch.conf r, /etc/localtime r, /etc/nsswitch.conf r,

1 0

[tlsdate/debian-master] Merge pull request #110 from elly/unittest-rmrf
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 35ff6cee8e15d529b67785c3b91ebd2f8039eb86 Merge: 37b1683 ed1b336 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat May 11 12:45:20 2013 -0700 Merge pull request #110 from elly/unittest-rmrf tlsdated: remove rmrf() src/tlsdated-unittest.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)

1 0

[tlsdate/debian-master] We care about the resulting server_time_s rather than time_map being 0
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 1ad5c8389f5592fe600c518f61bc8354f40ed18a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 26 19:40:23 2013 -0700 We care about the resulting server_time_s rather than time_map being 0 --- src/tlsdate-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 311a377..35d6779 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1191,7 +1191,7 @@ main(int argc, char **argv) #endif // We should never have a time_map of zero here; // It either stayed zero or we have a false ticker. - if (0 == time_map) + if ( 0 == server_time_s ) die ("child process failed to update time map; weird platform issues?\n"); munmap (time_map, sizeof (uint32_t));

1 0

[tlsdate/debian-master] Merge branch 'master' into debian-master
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0