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

[tlsdate/master] Merge pull request #95 from riastradh/implement-fmemopen-with-funopen
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit ca5ca2e0655738be7f308b98eb6b25cbf1896790 Merge: a52417b 07337c5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 18:58:11 2013 -0700 Merge pull request #95 from riastradh/implement-fmemopen-with-funopen Implement fmemopen in terms of funopen where needed and possible. 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(-)

1 0

[tlsdate/master] Merge pull request #96 from riastradh/implement-strnlen
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 1eb63c3cffd185e49afad85bb8eeccdfb4e456de Merge: ca5ca2e c9eeee0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 18:59:29 2013 -0700 Merge pull request #96 from riastradh/implement-strnlen Implement strnlen locally if the system libc doesn't have it. 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(+), 0 deletions(-)

1 0

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

19 Apr '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(+), 0 deletions(-) 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/master] Update .travis.yml packages
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit bc044efce9fa017c92e44a35875a03e34f20da99 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 15:59:14 2013 -0700 Update .travis.yml packages --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4c67a4..95d6a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev + - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev autotools automake pkg-config script: ./configure && make && make test

1 0

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

19 Apr '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

[tlsdate/master] Add DragonFly BSD in configure.ac
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit bddd9e8a2a0b8e9bbe701d258c329320e02f9a6a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:03:37 2013 -0700 Add DragonFly BSD in configure.ac --- configure.ac | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index d1649da..1ccaa5a 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,24 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *dragonfly*) + dnl This is for DragonFly BSD + 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.])]) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nobody@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nobody"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; *-bsd*) dnl This is a generic catch for BSD variants dnl This likely needs to be tuned to catch all

1 0

[tlsdate/master] Begin DragonFly BSD porting effort
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 556353ec01c525ae505e732cb60117aedf1ea9fd Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 19:58:23 2013 -0700 Begin DragonFly BSD porting effort --- m4/ax_platform.m4 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 85418f9..8822b86 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -56,6 +56,9 @@ [*openbsd*], [TARGET_OS_OPENBSD="true" AC_DEFINE([TARGET_OS_OPENBSD],[1],[Whether we are building for OpenBSD])], + [*dragonfly*], + [TARGET_OS_DRAGONFLYBSD="true" + AC_DEFINE([TARGET_OS_DRAGONFLYBSD],[1],[Whether we are building for DragonFly BSD])], [*bsd*], [TARGET_OS_BSD="true" AC_DEFINE([TARGET_OS_BSD],[1],[Whether we are building for some other *BSD])], @@ -73,5 +76,6 @@ AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_NETBSD],[test "x${TARGET_OS_NETBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_OPENBSD],[test "x${TARGET_OS_OPENBSD}" = "xtrue"]) + AM_CONDITIONAL([TARGET_DRAGONFLYBSD],[test "x${TARGET_OS_DRAGONFLYBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_BSD],[test "x${TARGET_OS_BSD}" = "xtrue"]) ])

1 0

[tlsdate/master] This allows us to generate Makefiles on DragonFly BSD
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit cb5fa1ce36cce68d3714be193a474250c4d08009 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 19:59:10 2013 -0700 This allows us to generate Makefiles on DragonFly BSD --- autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/autogen.sh b/autogen.sh index 4f6f639..8981cef 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,7 +17,7 @@ then export WARNINGS fi -if [ $(uname) = NetBSD ]; +if [ $(uname) = NetBSD ] || [ $(uname) = DragonFly ]; then WARNINGS="" export WARNINGS

1 0

[tlsdate/master] Update .travis.yml to reflect correct packages
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 4c0adb0d5e411f43a09ff7b079161f9fc2d64d23 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:17:52 2013 -0700 Update .travis.yml to reflect correct packages --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95d6a80..fd9d2fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev autotools automake pkg-config + - sudo apt-get install -qq autotools-dev dh-apparmor hardening-wrapper libssl-dev autoconf automake pkg-config script: ./configure && make && make test

1 0

[tlsdate/master] Add some TARGET_DRAGONFLYBSD goo to automake
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit b8cdc77514b0cf540bf32fd8a4c0ca28cd4321b4 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:28:14 2013 -0700 Add some TARGET_DRAGONFLYBSD goo to automake --- src/compat/include.am | 4 ++++ src/include.am | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/compat/include.am b/src/compat/include.am index 4f8cd30..0713c14 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -28,6 +28,10 @@ if TARGET_OPENBSD src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_DRAGONFLYBSD +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_BSD if !TARGET_NETBSD if !TARGET_FREEBSD diff --git a/src/include.am b/src/include.am index 7627850..d00f669 100644 --- a/src/include.am +++ b/src/include.am @@ -70,6 +70,16 @@ check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif +if TARGET_DRAGONFLYBSD +bin_PROGRAMS+= src/tlsdate +bin_PROGRAMS+= src/tlsdate-helper + +src_conf_unittest_SOURCES = src/conf.c +src_conf_unittest_SOURCES+= src/conf-unittest.c +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_BSD if !TARGET_FREEBSD if !TARGET_NETBSD @@ -203,6 +213,18 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_DRAGONFLYBSD +if !POLARSSL +src_proxy_bio_unittest_LDADD = @SSL_LIBS@ +src_proxy_bio_unittest_SOURCES = src/proxy-bio.c +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 +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + if TARGET_BSD if !POLARSSL if !TARGET_FREEBSD

1 0