tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tlsdate/debian-master] Add ChromeOS install note
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 90dba9ecb868a10fcd763e57e3713cd4d75f9cf6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 10:30:24 2013 -0700 Add ChromeOS install note --- INSTALL | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 6f4b5bb..5ac7418 100644 --- a/INSTALL +++ b/INSTALL @@ -8,7 +8,7 @@ tlsdate should build and work on the following Operating Systems: OpenSUSE 11.2, 12.3 FreeBSD 10-CURRENT Mac OS X 10.8.2, 10.8.3 - ChromeOS 26.0.x.x, 27.0.x.x (tlsdate is part of the ChromeOS TCB!) + ChromeOS Release 25, 26, 27 and above Android with the Android NDK (use Makefile.android) Arch Linux (Don't forget to symlink to /dev/rtc to /dev/rtc0) NetBSD 6.0.1 @@ -44,6 +44,10 @@ On Debian Gnu/Linux sid/unstable: apt-get install tlsdate +On ChromeOS: + + tlsdate is part of the ChromeOS TCB; no install needed + On Gentoo: emerge net-misc/tlsdate

1 0

[tlsdate/debian-master] Add ChromeOS CI url
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit b1ebf7b319fa032c81a7d82280dc795f7816f989 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 10:17:01 2013 -0700 Add ChromeOS CI url --- HACKING | 1 + 1 file changed, 1 insertion(+) diff --git a/HACKING b/HACKING index cb4564f..b11ce31 100644 --- a/HACKING +++ b/HACKING @@ -15,6 +15,7 @@ Continuous integration is available for a number of platforms: https://jenkins.torproject.org/job/tlsdate-ci-linux/ https://travis-ci.org/ioerror/tlsdate + http://build.chromium.org/p/chromiumos/waterfall White Space:

1 0

[tlsdate/debian-master] Don't clear CFLAGS and LIBS; let user pass them to configure.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 5617dda6eef9e85cd5e5e228f1ad4bf450f8cff4 Author: Taylor R Campbell <campbell(a)mumble.net> Date: Thu Apr 18 00:03:49 2013 +0000 Don't clear CFLAGS and LIBS; let user pass them to configure. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index d1649da..cec02f5 100644 --- a/configure.ac +++ b/configure.ac @@ -313,8 +313,6 @@ AC_DEFUN([LOCAL_CHECK_FLAGS],[ AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) AC_LANG_PUSH([C]) AS_IF([test "x$enable_hardened_checks" != xno], [ - CFLAGS= - LIBS= AX_APPEND_COMPILE_FLAGS([-g -O1]) ], [ AC_MSG_WARN([using hardened flags is HIGHLY RECOMMENDED and disabling them is a BAD IDEA])

1 0

[tlsdate/debian-master] Add note on likely emerge command for Gentoo in INSTALL
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit c6ca4c9b8d91950c8a3f0fabca84da48d33a580c Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 02:44:10 2013 -0700 Add note on likely emerge command for Gentoo in INSTALL --- INSTALL | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 423ed93..6f4b5bb 100644 --- a/INSTALL +++ b/INSTALL @@ -13,6 +13,7 @@ tlsdate should build and work on the following Operating Systems: Arch Linux (Don't forget to symlink to /dev/rtc to /dev/rtc0) NetBSD 6.0.1 OpenBSD 5.2 + Gentoo 20130413 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -39,10 +40,14 @@ Cleaning is the usual: make clean -On Debian Gnu/Linux sid/unstable +On Debian Gnu/Linux sid/unstable: apt-get install tlsdate +On Gentoo: + + emerge net-misc/tlsdate + On FreeBSD one may also use the ports system: cd /usr/ports/sysutils/tlsdate

1 0

[tlsdate/debian-master] Implement fmemopen in terms of funopen where needed and possible.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 07337c5255e6001031d456660174a39a1c73a11d Author: Taylor R Campbell <campbell(a)mumble.net> Date: Wed Apr 17 21:13:30 2013 +0000 Implement fmemopen in terms of funopen where needed and possible. Currently done only on NetBSD 5, but this should work for other BSDs and probably Android as well, instead of the libc-internal hacks that tlsdate currently uses for fmemopen on Android. --- configure.ac | 13 ++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 +++ src/conf-unittest.c | 6 ++ src/include.am | 9 +++ 5 files changed, 189 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index d1649da..a4f2eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,9 @@ AC_CHECK_HEADERS([unistd.h], ,[AC_MSG_ERROR([Required headers missing; compilati AC_CHECK_FUNCS([setresuid]) AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([fmemopen funopen]) +AM_CONDITIONAL(HAVE_FMEMOPEN, [test "x${ac_cv_func_fmemopen}" = xyes]) +AM_CONDITIONAL(HAVE_FUNOPEN, [test "x${ac_cv_func_funopen}" = xyes]) case "$host" in *-darwin*) @@ -182,11 +185,11 @@ case "$host" in dnl clock_gettime is either part of libc or unavailable. AC_CHECK_FUNC([clock_gettime], , [AC_MSG_ERROR([Your system lacks clock_gettime])]) - dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, - dnl the fmemopen prototype is hidden causing the unit tests to segfault. - dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang. - AC_CHECK_FUNC([fmemopen], , - [AC_MSG_WARN([Missing fmemopen, unit tests are likely to segfault. Try CC=clang.])]) + if test "x${ac_cv_func_fmemopen}" != xyes; then + if test "x${ac_cv_func_funopen}" != xyes; then + AC_MSG_ERROR([We need fmemopen or funopen for unit tests.]) + fi + fi AC_ARG_WITH([unpriv-group], [AS_HELP_STRING([--with-unpriv-group=<group>], [Group to drop privs to @<:@default: nobody@:>@])]) diff --git a/src/common/fmemopen-funopen.c b/src/common/fmemopen-funopen.c new file mode 100644 index 0000000..87c8675 --- /dev/null +++ b/src/common/fmemopen-funopen.c @@ -0,0 +1,158 @@ +/* + * POSIX 2008 fmemopen(3) implemented in terms of BSD funopen(3) + */ + +/* + * Copyright (c) 2013 Taylor R. Campbell + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define _BSD_SOURCE +#define _NETBSD_SOURCE + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "fmemopen.h" + +struct fmem_cookie { + void *fmc_buffer; + size_t fmc_index; + size_t fmc_limit; +}; + +static int +fmem_read(void *cookie, char *buffer, int n) +{ + struct fmem_cookie *const fmc = cookie; + + if (n < 0) { /* paranoia */ + errno = EINVAL; + return -1; + } + + if (n > (fmc->fmc_limit - fmc->fmc_index)) + n = (fmc->fmc_limit - fmc->fmc_index); + + (void)memcpy(buffer, (char *)fmc->fmc_buffer + fmc->fmc_index, n); + fmc->fmc_index += n; + return n; +} + +static int +fmem_write(void *cookie, const char *buffer, int n) +{ + struct fmem_cookie *const fmc = cookie; + + if (n < 0) { /* paranoia */ + errno = EINVAL; + return -1; + } + + if (n > (fmc->fmc_limit - fmc->fmc_index)) + n = (fmc->fmc_limit - fmc->fmc_index); + + (void)memcpy((char *)fmc->fmc_buffer + fmc->fmc_index, buffer, n); + fmc->fmc_index += n; + return n; +} + +static fpos_t +fmem_seek(void *cookie, fpos_t offset, int cmd) +{ + struct fmem_cookie *const fmc = cookie; + + switch (cmd) { + case SEEK_SET: + if ((offset < 0) || (fmc->fmc_limit < offset)) + goto einval; + fmc->fmc_index = offset; + return 0; + + case SEEK_CUR: + if (offset < 0) { + /* Assume two's-complement arithmetic. */ + if ((offset == ~(fpos_t)0) || (-offset > fmc->fmc_index)) + goto einval; + } else { + if (offset > (fmc->fmc_limit - fmc->fmc_index)) + goto einval; + } + fmc->fmc_index += offset; + return 0; + + case SEEK_END: + /* Assume two's-complement arithmetic. */ + if ((offset >= 0) || (offset == ~(fpos_t)0) || (fmc->fmc_limit < -offset)) + goto einval; + fmc->fmc_index = (fmc->fmc_limit + offset); + return 0; + + default: + goto einval; + } + +einval: + errno = EINVAL; + return -1; +} + +static int +fmem_close(void *cookie) +{ + struct fmem_cookie *const fmc = cookie; + + free(fmc); + + return 0; +} + +FILE * +fmemopen(void *buffer, size_t len, const char *mode) +{ + struct fmem_cookie *fmc; + FILE *file; + + fmc = malloc(sizeof(*fmc)); + if (fmc == NULL) + goto fail0; + + (void)memset(fmc, 0, sizeof(*fmc)); + fmc->fmc_buffer = buffer; + fmc->fmc_index = 0; + fmc->fmc_limit = len; + + file = funopen(fmc, &fmem_read, &fmem_write, &fmem_seek, &fmem_close); + if (file == NULL) + goto fail1; + + return file; + +fail1: + free(fmc); +fail0: + return NULL; +} diff --git a/src/common/fmemopen.h b/src/common/fmemopen.h new file mode 100644 index 0000000..28a2500 --- /dev/null +++ b/src/common/fmemopen.h @@ -0,0 +1,8 @@ +#ifndef TLSDATE_FMEMOPEN_H +#define TLSDATE_FMEMOPEN_H + +#include <stdio.h> + +FILE *fmemopen(void *, size_t, const char *); + +#endif /* TLSDATE_FMEMOPEN_H */ diff --git a/src/conf-unittest.c b/src/conf-unittest.c index 7a371ac..e883ac7 100644 --- a/src/conf-unittest.c +++ b/src/conf-unittest.c @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#include "config.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -17,6 +19,10 @@ #include "src/common/fmemopen.h" #endif +#ifndef HAVE_FMEMOPEN +#include "src/common/fmemopen.h" +#endif + FILE *fopenstr(const char *str) { /* strlen(str) instead of strlen(str) + 1 because files shouldn't appear * null-terminated. Cast away constness because we're in read mode, but the diff --git a/src/include.am b/src/include.am index 8d3a25c..76c916b 100644 --- a/src/include.am +++ b/src/include.am @@ -45,6 +45,15 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c src_conf_unittest_SOURCES+= src/common/android.c + +# XXX This conditional should apply for any system where we're building +# conf_unittest, but I don't know how to tell that to automake. +if !HAVE_FMEMOPEN +if HAVE_FUNOPEN +src_conf_unittest_SOURCES+= src/common/fmemopen-funopen.c +endif +endif + check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif

1 0

[tlsdate/debian-master] Check for <sys/socket.h> in configure.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit e707c0112e548e002db7f827a0c1686d8d97a868 Author: Taylor R Campbell <campbell(a)mumble.net> Date: Thu Apr 18 00:06:19 2013 +0000 Check for <sys/socket.h> in configure. Avoids redefinition of SHUT_* constants in config.h fragment provided by AX_PLATFORM. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index d1649da..7f9a926 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,7 @@ AC_CHECK_HEADERS([stdint.h], ,[AC_MSG_ERROR([Required headers missing; compilati AC_CHECK_HEADERS([stdio.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([stdlib.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([sys/mman.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) +AC_CHECK_HEADERS([sys/socket.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([sys/time.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([sys/types.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])]) AC_CHECK_HEADERS([sys/wait.h], ,[AC_MSG_ERROR([Required headers missing; compilation will not succeed])])

1 0

[tlsdate/debian-master] Merge pull request #92 from riastradh/check-for-syssocketh
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit f4953f18d7f3a95b2ac76ebc6365edceaa08b840 Merge: 90dba9e e707c01 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 18:42:14 2013 -0700 Merge pull request #92 from riastradh/check-for-syssocketh Check for <sys/socket.h> in configure. configure.ac | 1 + 1 file changed, 1 insertion(+)

1 0

[tlsdate/debian-master] Merge pull request #94 from riastradh/fix-ctype-casts
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit a52417b563f47a6b590022d8dff1a3857599305b Merge: bfd616e 6b7041d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 18:56:26 2013 -0700 Merge pull request #94 from riastradh/fix-ctype-casts Cast char to unsigned char before passing to ctype(3) isXYZ. src/conf.c | 2 +- src/tlsdate-helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tlsdate/debian-master] Implement strnlen locally if the system libc doesn't have it.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit c9eeee07453ba32b3344180584554736b0fcb5bd Author: Taylor R Campbell <campbell(a)mumble.net> Date: Wed Apr 17 21:14:24 2013 +0000 Implement strnlen locally if the system libc doesn't have it. Needed for, and currently built only on, NetBSD 5. --- configure.ac | 3 +++ src/common/strnlen.c | 19 +++++++++++++++++++ src/common/strnlen.h | 8 ++++++++ src/include.am | 11 +++++++++++ src/proxy-bio.c | 6 ++++++ src/proxy-polarssl.c | 6 ++++++ 6 files changed, 53 insertions(+) diff --git a/configure.ac b/configure.ac index d1649da..b4647bf 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,9 @@ 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_FUNCS([strnlen]) +AM_CONDITIONAL(HAVE_STRNLEN, [test "x${ac_cv_func_strnlen}" = xyes]) + AC_CHECK_FUNCS([setresuid]) AC_CHECK_FUNCS([gettimeofday]) diff --git a/src/common/strnlen.c b/src/common/strnlen.c new file mode 100644 index 0000000..38e56e1 --- /dev/null +++ b/src/common/strnlen.c @@ -0,0 +1,19 @@ +/* + * Trivial strnlen(3) implementation + */ + +#include <stddef.h> + +#include "strnlen.h" + +size_t +strnlen(const char *s, size_t limit) +{ + size_t len; + + for (len = 0; len < limit; len++) + if (*s++ == '\0') + break; + + return len; +} diff --git a/src/common/strnlen.h b/src/common/strnlen.h new file mode 100644 index 0000000..945c0d4 --- /dev/null +++ b/src/common/strnlen.h @@ -0,0 +1,8 @@ +#ifndef TLSDATE_STRNLEN_H +#define TLSDATE_STRNLEN_H + +#include <stddef.h> + +size_t strnlen(const char *, size_t); + +#endif /* TLSDATE_STRNLEN_H */ diff --git a/src/include.am b/src/include.am index 8d3a25c..f25c104 100644 --- a/src/include.am +++ b/src/include.am @@ -103,6 +103,10 @@ src_tlsdate_helper_SOURCES+= src/proxy-bio.c endif src_tlsdate_helper_SOURCES+= src/util.c +if !HAVE_STRNLEN +src_tlsdate_helper_SOURCES+= src/common/strnlen.c +endif + # This doesn't work on Mac OS X if TARGET_LINUX src_tlsdated_CFLAGS = -DTLSDATED_MAIN @SSL_CFLAGS@ @@ -164,6 +168,13 @@ src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c src_proxy_bio_unittest_SOURCES+= src/common/android.c + +# XXX This conditional should apply for any system where we're building +# proxy_bio_unittest, but I don't know how to tell that to automake. +if !HAVE_STRNLEN +src_proxy_bio_unittest_SOURCES+= src/common/strnlen.c +endif + check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif diff --git a/src/proxy-bio.c b/src/proxy-bio.c index 1290423..2bae965 100644 --- a/src/proxy-bio.c +++ b/src/proxy-bio.c @@ -17,6 +17,8 @@ * SSL. */ +#include "config.h" + #include <arpa/inet.h> #include <assert.h> #ifndef __USE_MISC @@ -29,6 +31,10 @@ #include <stdint.h> +#ifndef HAVE_STRNLEN +#include "src/common/strnlen.h" +#endif + #include "src/proxy-bio.h" int socks4a_connect(BIO *b); diff --git a/src/proxy-polarssl.c b/src/proxy-polarssl.c index 5608aaa..8d21041 100644 --- a/src/proxy-polarssl.c +++ b/src/proxy-polarssl.c @@ -12,6 +12,8 @@ * This file implements a SOCKS4a/SOCKS5 net layer as used by PolarSSL. */ +#include "config.h" + #include <arpa/inet.h> #include <assert.h> #ifndef __USE_MISC @@ -24,6 +26,10 @@ #include <stdint.h> #include <stdio.h> +#ifndef HAVE_STRNLEN +#include "src/common/strnlen.h" +#endif + #include "src/proxy-polarssl.h" #include "src/util.h"

1 0

[tlsdate/debian-master] Cast char to unsigned char before passing to ctype(3) isXYZ.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 6b7041dbaf46d3fdff5a7cadccf8a99bf9bfe779 Author: Taylor R Campbell <campbell(a)mumble.net> Date: Wed Apr 17 21:04:33 2013 +0000 Cast char to unsigned char before passing to ctype(3) isXYZ. The ctype(3) routines take an int, but the only valid arguments are EOF and values representable as unsigned char. This is what you get out of, e.g., getc(3), but an arbitrary value of type char is not OK because negative values will lead to nasal demons. Converting an arbitrary value of type char to unsigned char is OK, since then we have only non-negative values, and casting that to int makes it clearer what's going on. --- src/conf.c | 2 +- src/tlsdate-helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf.c b/src/conf.c index 3b50ea3..b093676 100644 --- a/src/conf.c +++ b/src/conf.c @@ -31,7 +31,7 @@ void strip_newlines(char *line) char *eat_whitespace(char *line) { - while (isspace(*line)) + while (isspace((int)(unsigned char)*line)) line++; return line; } diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 4c5c6ca..3e85bed 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -122,7 +122,7 @@ static void validate_proxy_port(const char *port) { while (*port) - if (!isdigit(*port++)) + if (!isdigit((int)(unsigned char)*port++)) die("invalid char in port\n"); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013