tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tlsdate/debian-master] tlsdate, docs: make -V taken an optional arg to simplify showtime
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit d8fc0e8f732886507322b65865e933f663cc720e Author: Will Drewry <wad(a)chromium.org> Date: Fri Sep 13 19:47:38 2013 -0500 tlsdate, docs: make -V taken an optional arg to simplify showtime Update the man pages and simplify the processing of -V and --showtime to share the optional argument path. --- man/tlsdate.1 | 5 +++-- src/tlsdate.c | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/tlsdate.1 b/man/tlsdate.1 index 8ce9d18..e34c81d 100644 --- a/man/tlsdate.1 +++ b/man/tlsdate.1 @@ -49,8 +49,9 @@ The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed: The proxy support should not leak DNS requests and is suitable for use with Tor. .IP "\-v | \-\-verbose" Provide verbose output -.IP "\-V | \-\-showtime" -Show the time retrieved from the remote server +.IP "\-V | \-\-showtime [human|raw]" +Show the time retrieved from the remote server in a human-readable format or as +a raw time_t. .IP "\-t | \-\-timewarp" If the local clock is before RECENT_COMPILE_DATE; we set the clock to the RECENT_COMPILE_DATE. If the local clock is after RECENT_COMPILE_DATE, we leave diff --git a/src/tlsdate.c b/src/tlsdate.c index c19ef69..26e9432 100644 --- a/src/tlsdate.c +++ b/src/tlsdate.c @@ -132,7 +132,7 @@ main(int argc, char **argv) static struct option long_options[] = { {"verbose", 0, 0, 'v'}, - {"showtime", 2, 0, 'R'}, + {"showtime", 2, 0, 'V'}, {"skip-verification", 0, 0, 's'}, {"help", 0, 0, 'h'}, {"host", 0, 0, 'H'}, @@ -146,15 +146,14 @@ main(int argc, char **argv) {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "vVshH:p:P:nC:tlx:", + c = getopt_long(argc, argv, "vV::shH:p:P:nC:tlx:", long_options, &option_index); if (c == -1) break; switch (c) { case 'v': verbose = 1; break; - case 'V': showtime = 1; break; - case 'R': showtime = (optarg && 0 == strcmp("raw", optarg) ? 2:1); break; + case 'V': showtime = (optarg && 0 == strcmp("raw", optarg) ? 2:1); break; case 's': ca_racket = 0; break; case 'h': usage(); exit(1); break; case 'H': host = optarg; break;

1 0

[tlsdate/debian-master] Merge pull request #118 from elly/event-loop
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 97d90d0c26a6695217c81eb496c5e4476fa17cac Merge: 0bd0c2d aa04c01 Author: \033]2;Jacob Appelbaum\007 <jacob(a)appelbaum.net> Date: Sat Sep 14 14:36:10 2013 -0700 Merge pull request #118 from elly/event-loop Refactor event loop. CHANGELOG | 2 + Makefile.am | 2 +- run-tests | 4 +- src/event-unittest.c | 48 ++++++++ src/event.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++ src/event.h | 21 ++++ src/include.am | 10 +- src/tlsdate.h | 4 + src/tlsdated-unittest.c | 80 +++++++++++++ src/tlsdated.c | 300 +++++++++++++++++++++++++---------------------- src/util.c | 187 +++++++++++++++++++++++++++++ src/util.h | 19 +++ tests/common.sh | 2 +- 13 files changed, 831 insertions(+), 143 deletions(-)

1 0

[tlsdate/debian-master] Merge pull request #119 from redpig/showtime=raw
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit cb812067f3fa70058779c6ba3f610924b34ff853 Merge: 97d90d0 d8fc0e8 Author: \033]2;Jacob Appelbaum\007 <jacob(a)appelbaum.net> Date: Sat Sep 14 14:43:20 2013 -0700 Merge pull request #119 from redpig/showtime=raw tlsdate: add optional --showtime support for "raw" man/tlsdate.1 | 5 +++-- src/tlsdate-helper.c | 7 +++++++ src/tlsdate.c | 10 +++++----- src/tlsdate.h | 1 + 4 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tlsdate/debian-master] Change check for RTC to be configure based.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit fddd223536b0f68ab5a09a35c454cca9d96d38c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 15:01:53 2013 -0400 Change check for RTC to be configure based. Previously I had disabled it with #ifdef __linux__, but that's not very good autoconf style. --- configure.ac | 7 +++++++ src/util.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 231547e..f1a424f 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,13 @@ AC_CHECK_HEADERS([sys/wait.h], ,[AC_MSG_ERROR([Required headers missing; compila AC_CHECK_HEADERS([time.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([unistd.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) +AC_CHECK_HEADERS([linux/rtc.h]) +AC_CHECK_TYPES([struct rtc_time], [], [], [ +#ifdef HAVE_LINUX_RTC_H +#include <linux/rtc.h> +#endif +]) + AC_CHECK_FUNCS([strnlen]) AM_CONDITIONAL(HAVE_STRNLEN, [test "x${ac_cv_func_strnlen}" = xyes]) diff --git a/src/util.c b/src/util.c index 129de8d..4f1d0e0 100644 --- a/src/util.c +++ b/src/util.c @@ -11,7 +11,7 @@ #include <fcntl.h> #include <grp.h> #include <limits.h> -#ifdef __linux__ +#ifdef HAVE_LINUX_RTC_H #include <linux/rtc.h> #endif #include <pwd.h> @@ -29,6 +29,10 @@ #include "src/util.h" +#if defined(HAVE_STRUCT_RTC_TIME) && defined(RTC_SET_TIME) && defined(RTC_RD_TIME) +#define ENABLE_RTC +#endif + const char *kTempSuffix = DEFAULT_DAEMON_TMPSUFFIX; /** helper function to print message and die */ @@ -145,7 +149,7 @@ wait_with_timeout(int *status, int timeout_secs) return exited; } -#ifdef __linux__ +#ifdef ENABLE_RTC struct rtc_handle { int fd; @@ -308,7 +312,7 @@ int pgrp_kill(void) } static struct platform default_platform = { -#ifdef __linux__ +#ifdef ENABLE_RTC .rtc_open = rtc_open, .rtc_write = rtc_write, .rtc_read = rtc_read,

1 0

[tlsdate/debian-master] Describe what an HTTP date is
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0c085d991f65af84ed838007fbd5d6af51cb5e6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 15:08:30 2013 -0400 Describe what an HTTP date is --- src/tlsdate-helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 2a92195..2e0e2fb 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -223,6 +223,15 @@ handle_date_line(const char *dateline, uint32_t *result) struct tm tm; int i; time_t t; + /* We recognize the three formats in RFC2616, section 3.3.1. Month + names are always in English. The formats are: + + Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 + Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 + Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format + + Note that the first is preferred. + */ static const char *MONTHS[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",

1 0

[tlsdate/debian-master] In verbose mode, display TLS time as well as HTTPS time
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit f70fba4051e1a1abcf12cebb2cc462ea5bd847cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 15:16:23 2013 -0400 In verbose mode, display TLS time as well as HTTPS time --- src/tlsdate-helper.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index a724402..4dce354 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1205,6 +1205,11 @@ run_ssl (uint32_t *time_map, int time_is_an_illusion, int http) if (1 != BIO_do_handshake(s_bio)) die ("SSL handshake failed\n"); + // from /usr/include/openssl/ssl3.h + // ssl->s3->server_random is an unsigned char of 32 bits + memcpy(&result_time, ssl->s3->server_random, sizeof (uint32_t)); + verb("V: In TLS response, T=%lu\n", (unsigned long)ntohl(result_time)); + if (http) { char buf[1024]; verb("V: Starting HTTP\n"); @@ -1221,10 +1226,6 @@ run_ssl (uint32_t *time_map, int time_is_an_illusion, int http) verb("V: Got HTTP response. T=%lu\n", (unsigned long)result_time); result_time = htonl(result_time); - } else { - // from /usr/include/openssl/ssl3.h - // ssl->s3->server_random is an unsigned char of 32 bits - memcpy(&result_time, ssl->s3->server_random, sizeof (uint32_t)); } // Verify the peer certificate against the CA certs on the local system

1 0

[tlsdate/debian-master] Don't log raw dates, in case they contain junk.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 2dafddce642c497477c27a3f7a005be2865755f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 15:08:33 2013 -0400 Don't log raw dates, in case they contain junk. --- src/tlsdate-helper.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 2e0e2fb..a5017d5 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -215,6 +215,19 @@ write_all_to_bio(BIO *bio, const char *string) return 1; } +/* If the string is all nice clean ascii that it's safe to log, return + * it. Otherwise return a placeholder "This is junk" string. */ +static const char * +sanitize_string(const char *s) +{ + const unsigned char *cp; + for (cp = (const unsigned char *)s; *cp; cp++) { + if (*cp < 32 || *cp > 127) + return "string with invalid characters"; + } + return s; +} + static int handle_date_line(const char *dateline, uint32_t *result) { @@ -241,7 +254,7 @@ handle_date_line(const char *dateline, uint32_t *result) return 0; dateline += 8; - verb("V: The alleged date is <%s>\n", dateline); + verb("V: The alleged date is <%s>\n", sanitize_string(dateline)); while (*dateline == ' ') ++dateline;

1 0

[tlsdate/debian-master] Document magic "1900" value
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 9d2f77df0b99ec03545418caa05903dd6aaf1adc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 15:11:17 2013 -0400 Document magic "1900" value --- src/tlsdate-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index a5017d5..a724402 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -270,6 +270,8 @@ handle_date_line(const char *dateline, uint32_t *result) sscanf(dateline, "%3s %d %d:%d:%d %d", month, &day, &hour, &min, &sec, &year) == 6) { + /* Two digit dates are defined to be relative to 1900; all other dates + * are supposed to be represented as four digits. */ if (year < 100) year += 1900;

1 0

[tlsdate/debian-master] Define a max length for the HTTP Date: header
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit df8cbc962d330c692dc1bac3ce11e8507787131b Author: Ingy döt Net <ingy(a)ingy.net> Date: Wed Oct 30 16:21:06 2013 +0000 Define a max length for the HTTP Date: header --- src/tlsdate-helper.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tlsdate-helper.h b/src/tlsdate-helper.h index 6890a88..7b6e181 100644 --- a/src/tlsdate-helper.h +++ b/src/tlsdate-helper.h @@ -89,6 +89,9 @@ int verbose; // To support our RFC 2595 wildcard verification #define RFC2595_MIN_LABEL_COUNT 3 +// Define a max length for the HTTP Date: header +#define MAX_DATE_LINE_LEN 32 + static int ca_racket; static const char *host;

1 0

[tlsdate/debian-master] Restrict loggable date fields even harder.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit cc1fde04ad35d4df138390e04e981a04ff34073e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 14 11:30:00 2013 -0400 Restrict loggable date fields even harder. --- src/tlsdate-helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 7813158..311d374 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -222,7 +222,7 @@ sanitize_string(const char *s) { const unsigned char *cp; for (cp = (const unsigned char *)s; *cp; cp++) { - if (*cp < 32 || *cp > 127) + if (*cp < 32 || *cp >= 127) return "string with invalid characters"; } return s; @@ -254,6 +254,10 @@ handle_date_line(const char *dateline, uint32_t *result) return 0; dateline += 8; + if (strlen(dateline) > MAX_DATE_LINE_LEN) { + verb("V: The date line was impossibly long.\n"); + return -1; + } verb("V: The alleged date is <%s>\n", sanitize_string(dateline)); while (*dateline == ' ')

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
129
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013