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

[tlsdate/debian-master] Update the README to use the current git tip
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 7a33632a3283a95582b3e385c59b1fb2cc9fd06b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 18:08:49 2013 -0700 Update the README to use the current git tip --- README | 68 ++++++++++++++++++---------------------------------------------- 1 file changed, 19 insertions(+), 49 deletions(-) diff --git a/README b/README index 8e907d3..1c9e793 100644 --- a/README +++ b/README @@ -14,70 +14,40 @@ invoke tlsdate to keep the clock in sync. Start it like so: Here is an example an unprivileged user fetching the remote time: - % tlsdate -v -V -n - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: time is currently 1342197117.577381 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 1342197117 (difference is about 0 s) was fetched in 705 ms - Fri Jul 13 18:31:57 CEST 2012 + % tlsdate -V -n -H encrypted.google.com + Fri Apr 19 17:56:46 PDT 2013 -This is an example run - starting as root and dropping to nobody: +This is an example run - starting as root and dropping to nobody, setting the +clock and printing it: + + % sudo tlsdate -V + Fri Apr 19 17:57:49 PDT 2013 - % sudo ./tlsdate -v - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: time is currently 1342197222.273552 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 1342197222 (difference is about 0 s) was fetched in 520 ms - V: setting time succeeded Here is an example with a custom host and custom port without verification: % sudo tlsdate -v --skip-verification -p 80 -H rgnx.net - V: tlsdate version 0.0.1 + V: tlsdate version 0.0.6 V: We were called with the following arguments: V: disable SSL certificate check host = rgnx.net:80 WARNING: Skipping certificate verification! - V: time is currently 1342197285.298607 + V: time is currently 1366419507.456647065 + V: time is greater than RECENT_COMPILE_DATE V: using TLSv1_client_method() + V: Using OpenSSL for SSL + V: opening socket to rgnx.net:80 V: Certificate verification skipped! - V: server time 1342197286 (difference is about -1 s) was fetched in 765 ms + V: public key is ready for inspection + V: key type: EVP_PKEY_RSA + V: keybits: 1024 + V: key length appears safe + V: server time 1366419508 (difference is about -1 s) was fetched in 338 ms V: setting time succeeded -Here is an example of a false ticker that is detected and rejected: - - % sudo tlsdate -v -H facebook.com - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = facebook.com:443 - V: time is currently 1342197379.931852 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 2693501503 (difference is about -1351304124 s) was fetched in 724 ms - remote server is a false ticker from the future! - Here is an example where a system may not have any kind of RTC at boot. Do the time warp to restore sanity and do so with a leap of faith: - % sudo tlsdate -v -V -l -t - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: RECENT_COMPILE_DATE is 1342407042.000000 - V: time is currently 1342488229.659967 - V: time is greater than RECENT_COMPILE_DATE - V: using TLSv1_client_method() - V: freezing time for x509 verification - V: remote peer provided: 1342488230, prefered over compile time: 1342407042 - V: freezing time with X509_VERIFY_PARAM_set_time - V: SSL certificate verification passed - V: server time 1342488230 (difference is about -1 s) was fetched in 791 ms - Mon Jul 16 18:23:50 PDT 2012 - V: setting time succeeded + % sudo tlsdate -V -l -t + Fri Apr 19 18:08:03 PDT 2013

1 0

[tlsdate/debian-master] Update location for tlsdated man page
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 1d55e9b726e109738c2aaba11cae1d018d334100 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Apr 20 22:22:31 2013 -0700 Update location for tlsdated man page --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a46f959..0523287 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,7 +78,7 @@ man_MANS+= man/tlsdate.1 man_MANS+= man/tlsdate-helper.1 if TARGET_LINUX -man_MANS+= man/tlsdated.1 +man_MANS+= man/tlsdated.8 man_MANS+= man/tlsdate-routeup.1 man_MANS+= man/tlsdated.conf.5 man_MANS+= man/tlsdate-dbus-announce.1

1 0

[tlsdate/debian-master] Add support for building with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3)
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 455a90cf939aee0cbeb8e4186f84771895bfa959 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 20:35:15 2013 -0700 Add support for building with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) --- INSTALL | 6 ++++++ autogen.sh | 6 ++++++ configure.ac | 17 +++++++++++++++++ m4/ax_platform.m4 | 2 +- src/compat/clock.h | 2 ++ src/compat/include.am | 4 ++++ src/include.am | 24 ++++++++++++++++++++++++ 7 files changed, 60 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 5f34cd4..b0cc565 100644 --- a/INSTALL +++ b/INSTALL @@ -15,6 +15,7 @@ tlsdate should build and work on the following Operating Systems: OpenBSD 5.2 Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT + Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) 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 @@ -95,6 +96,11 @@ On Arch Linux there is a PKGBUILD in the Arch User Repository: https://aur.archlinux.org/packages/tlsdate https://aur.archlinux.org/packages/tl/tlsdate/PKGBUILD +Cygwin requires that the user installs openssl-dev, gcc, pkg-config, libtool, automake, autoconf: + + ./configure + make + On Plan9 the start of building might look something like this: ip/ipconfig diff --git a/autogen.sh b/autogen.sh index 8981cef..51c926a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,4 +23,10 @@ then export WARNINGS fi +if [ $(uname) != "CYGWIN_NT-6.1" ]; +then + WARNINGS="" + export WARNINGS +fi + autoreconf --install --verbose --force diff --git a/configure.ac b/configure.ac index aa37bfa..696f8c4 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,23 @@ case "$host" in [""|yes|no], [UNPRIV_GROUP="nogroup"], [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; + *-cygwin*) + dnl This is for Cygwin + dnl Check for clock_gettime. Some systems put it into -lc, while + dnl others use -lrt. Try the first and fallback to the latter. + RT_LIB= + AC_CHECK_FUNC([clock_gettime], [:], + [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], + [AC_MSG_ERROR([Your system lacks clock_gettime])])]) + AC_SUBST(RT_LIB) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nogroup@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nogroup"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) case "$host" in *-linux-androideabi) dnl This is for Android NDK as it is a special case of linux diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 172a4e5..c613206 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -47,7 +47,7 @@ # define SHUT_RDWR SD_BOTH #endif ])], - [*CYGWIN_NT*], + [*cygwin*], [TARGET_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], [*freebsd*], diff --git a/src/compat/clock.h b/src/compat/clock.h index 2bcdb2e..7040d3c 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -36,6 +36,8 @@ struct tlsdate_time { mach_timespec_t tp; #elif _WIN32 void *tp; +#elif TARGET_OS_CYGWIN + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 0713c14..b168c3a 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -40,4 +40,8 @@ endif endif endif +if TARGET_CYGWIN +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + src_compat_libtlsdate_compat_la_LIBADD+= @RT_LIB@ diff --git a/src/include.am b/src/include.am index 38da0c7..c5ea63b 100644 --- a/src/include.am +++ b/src/include.am @@ -96,6 +96,17 @@ endif endif endif +if TARGET_CYGWIN +bin_PROGRAMS+= src/tlsdate +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 +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_OSX bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -244,6 +255,19 @@ endif endif endif +if TARGET_CYGWIN +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 +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + # We're not shipping headers noinst_HEADERS+= src/routeup.h noinst_HEADERS+= src/test_harness.h

1 0

[tlsdate/debian-master] move tlsdated into sbin; per Paul Wouter's request
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0fc6257f2af66c3fcd4b360638032d57c134b60f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Apr 20 22:48:35 2013 -0700 move tlsdated into sbin; per Paul Wouter's request --- Makefile.am | 1 + src/include.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0523287..5013746 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ doc_DATA= EXTRA_DIST= TESTS= bin_PROGRAMS= +sbin_PROGRAMS= check_PROGRAMS= lib_LTLIBRARIES= man_MANS= diff --git a/src/include.am b/src/include.am index 58e0df0..38da0c7 100644 --- a/src/include.am +++ b/src/include.am @@ -14,9 +14,10 @@ if TARGET_LINUX bin_PROGRAMS+= src/tlsdate-routeup bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper -bin_PROGRAMS+= src/tlsdated bin_PROGRAMS+= src/tlsdate-dbus-announce +sbin_PROGRAMS+= src/tlsdated + src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c

1 0

[tlsdate/debian-master] Add TARGET_CYGWIN to ax_platform
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 27895e1358a05753cc5d198f4b4d9ec465eb7dbe Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 18:48:45 2013 -0700 Add TARGET_CYGWIN to ax_platform --- m4/ax_platform.m4 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 8822b86..172a4e5 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -36,7 +36,7 @@ AS_CASE([$target_os], [*mingw32*], [TARGET_WINDOWS="true" - AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) + AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) @@ -47,6 +47,9 @@ # define SHUT_RDWR SD_BOTH #endif ])], + [*CYGWIN_NT*], + [TARGET_CYGWIN="true" + AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], [*freebsd*], [TARGET_OS_FREEBSD="true" AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])], @@ -64,13 +67,14 @@ AC_DEFINE([TARGET_OS_BSD],[1],[Whether we are building for some other *BSD])], [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])], [*darwin*], - [TARGET_OSX="true" - AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], - [*linux*], - [TARGET_LINUX="true" - AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) + [TARGET_OSX="true" + AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], + [*linux*], + [TARGET_LINUX="true" + AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"]) AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_LINUX}" = "xtrue"]) AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"])

1 0

[tlsdate/debian-master] Add note on current state of affairs for Windows in HARDENING
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit e413b7d7617d6797bcdcdd30b5d8e768915efa8d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 22:39:04 2013 -0700 Add note on current state of affairs for Windows in HARDENING --- HARDENING | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HARDENING b/HARDENING index 67b762c..e977395 100644 --- a/HARDENING +++ b/HARDENING @@ -70,5 +70,7 @@ On Mac OS X, we'd like to support chroot and seatbelt. On Plan9, we'd like to chroot. +On Windows, we do nothing beyond compile time hardening. We'd like to do more. + On other platforms, we'll try to run correctly with the understanding that any bug is likely a much more serious problem.

1 0

[tlsdate/debian-master] Why not support a port to Minix, we support Windows...
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 9478d57676dc2132e43f5105010fca68efef7153 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 22:14:00 2013 -0700 Why not support a port to Minix, we support Windows... --- INSTALL | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL b/INSTALL index b0cc565..67554ae 100644 --- a/INSTALL +++ b/INSTALL @@ -27,6 +27,7 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: OpenVMS Irix GNU/Hurd + Minix Any of the classic unix systems Currently porting is in progress or partially documented for:

1 0

[tlsdate/debian-master] Add build support for Haiku and perhaps BeOS; needs testing
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit f0f17b98fa4c2a5a20a255be4b631d9e3d8bf704 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 04:08:57 2013 -0700 Add build support for Haiku and perhaps BeOS; needs testing --- INSTALL | 8 ++++++++ configure.ac | 20 ++++++++++++++++++++ m4/ax_platform.m4 | 4 ++++ src/compat/clock.h | 2 ++ src/compat/include.am | 4 ++++ src/conf.c | 4 ++++ src/include.am | 24 ++++++++++++++++++++++++ src/tlsdate-helper.h | 4 ++++ src/util.h | 4 ++++ 9 files changed, 74 insertions(+) diff --git a/INSTALL b/INSTALL index 67554ae..170ad24 100644 --- a/INSTALL +++ b/INSTALL @@ -33,6 +33,7 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Currently porting is in progress or partially documented for: Plan9 (with APE) + Haiku Building and install of tlsdate on GNU/Linux and FreeBSD: @@ -110,6 +111,13 @@ On Plan9 the start of building might look something like this: /n/sources/contrib/fgb/root/rc/bin/contrib/install fgb/openssl mk install +On Haiku we must use gcc4: + + export CC=/boot/develop/abi/x86/gcc4/tools/gcc4.6.3-haiku-121101/bin/gcc + export LDFLAGS="$LDFLAGS -lbsd" + ./configure + make + OpenBSD builds from source and is not yet in the port system: export AUTOCONF_VERSION=<your installed version> diff --git a/configure.ac b/configure.ac index 696f8c4..b3e7df1 100644 --- a/configure.ac +++ b/configure.ac @@ -290,6 +290,26 @@ case "$host" in [""|yes|no], [UNPRIV_GROUP="nogroup"], [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; + *-beos*|*-haiku*) + dnl This is for BeOS and Haiku; we probably only support Haiku with gcc4 + dnl Check for clock_gettime. Some systems put it into -lc, while + dnl others use -lrt. Try the first and fallback to the latter. + dnl on Haiku we require the bsd library for strsep + RT_LIB= + AC_CHECK_FUNC([clock_gettime], [:], + [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], + [AC_MSG_ERROR([Your system lacks clock_gettime])])]) + AC_SUBST(RT_LIB) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nogroup@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nogroup"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + LDFLAGS="$LDFLAGS -lbsd" + CC="/boot/develop/abi/x86/gcc4/tools/gcc-4.6.3-haiku-121101/bin/gcc" case "$host" in *-linux-androideabi) dnl This is for Android NDK as it is a special case of linux diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index c613206..baffd1e 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -50,6 +50,9 @@ [*cygwin*], [TARGET_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], + [*haiku*], + [TARGET_HAIKU="true" + AC_DEFINE([TARGET_OS_HAIKU],[1],[Whether we build for Haiku])], [*freebsd*], [TARGET_OS_FREEBSD="true" AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])], @@ -75,6 +78,7 @@ AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) + AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_HAIKU}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"]) AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_LINUX}" = "xtrue"]) AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"]) diff --git a/src/compat/clock.h b/src/compat/clock.h index 7040d3c..e8220bd 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -36,6 +36,8 @@ struct tlsdate_time { mach_timespec_t tp; #elif _WIN32 void *tp; +#elif TARGET_OS_HAIKU + struct timespec tp; #elif TARGET_OS_CYGWIN struct timespec tp; #endif diff --git a/src/compat/include.am b/src/compat/include.am index b168c3a..9623362 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -44,4 +44,8 @@ if TARGET_CYGWIN src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_HAIKU +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + src_compat_libtlsdate_compat_la_LIBADD+= @RT_LIB@ diff --git a/src/conf.c b/src/conf.c index 607f523..6182650 100644 --- a/src/conf.c +++ b/src/conf.c @@ -23,6 +23,10 @@ #include "src/common/android.h" // XXX: Dirty hack - make this more generic later #endif +#ifdef TARGET_OS_HAIKU +#include "src/common/android.h" // XXX: Dirty hack - make this more generic later +#endif + #ifdef HAVE_ANDROID #include "src/common/android.h" #endif diff --git a/src/include.am b/src/include.am index c5ea63b..0ec38b2 100644 --- a/src/include.am +++ b/src/include.am @@ -107,6 +107,17 @@ check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif +if TARGET_HAIKU +bin_PROGRAMS+= src/tlsdate +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 +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_OSX bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -268,6 +279,19 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_HAIKU +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 +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + # We're not shipping headers noinst_HEADERS+= src/routeup.h noinst_HEADERS+= src/test_harness.h diff --git a/src/tlsdate-helper.h b/src/tlsdate-helper.h index f3af23d..2456efc 100644 --- a/src/tlsdate-helper.h +++ b/src/tlsdate-helper.h @@ -14,6 +14,10 @@ #include <stdint.h> #include <stdio.h> #include <string.h> +#ifdef TARGET_OS_HAIKU +#include <posix/string.h> +#include <bsd/string.h> +#endif #include <unistd.h> #include <sys/stat.h> #include <sys/time.h> diff --git a/src/util.h b/src/util.h index 7d7cb11..bfd61dd 100644 --- a/src/util.h +++ b/src/util.h @@ -12,6 +12,10 @@ #include <string.h> #include <stdlib.h> +#ifdef TARGET_OS_HAIKU +#include <stdarg.h> +#endif + #define API __attribute__((visibility("default"))) extern int verbose;

1 0

[tlsdate/debian-master] Make ax_platform consistent in naming of targets
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit ed10f493152ac28c81f836cd3ba3da04d308ae35 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 17:53:09 2013 -0700 Make ax_platform consistent in naming of targets --- m4/ax_platform.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 1747ca7..6e43ab8 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -35,7 +35,7 @@ AS_CASE([$target_os], [*mingw32*], - [TARGET_WINDOWS="true" + [TARGET_OS_WINDOWS="true" AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) @@ -48,10 +48,10 @@ #endif ])], [*cygwin*], - [TARGET_CYGWIN="true" + [TARGET_OS_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], [*haiku*], - [TARGET_HAIKU="true" + [TARGET_OS_HAIKU="true" AC_DEFINE([TARGET_OS_HAIKU],[1],[Whether we build for Haiku])], [*freebsd*], [TARGET_OS_FREEBSD="true" @@ -76,11 +76,11 @@ [TARGET_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) - AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) - AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) - AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_HAIKU}" = "xtrue"]) - AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"]) - AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_LINUX}" = "xtrue"]) + AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_OS_CYGWIN}" = "xtrue"]) + AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_OS_HAIKU}" = "xtrue"]) + AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OS_OSX}" = "xtrue"]) + AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_OS_LINUX}" = "xtrue"]) 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"])

1 0

[tlsdate/debian-master] Fixup windows build target for mingw
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0fa60007a6d49e0c40b44f3c95d7eb6741cb7a38 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 17:49:23 2013 -0700 Fixup windows build target for mingw --- m4/ax_platform.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index baffd1e..1747ca7 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -76,7 +76,7 @@ [TARGET_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) - AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_HAIKU}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"])

1 0