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

[stem/master] Helper for getting torrc of a target
by atagar＠torproject.org 25 Apr '13

25 Apr '13

commit c7ed4c84b30c8555ba8e2e63c158b74876d08db2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 24 09:27:07 2013 -0700 Helper for getting torrc of a target Breaking a chunk of run_tests.py into a get_torrc_entries() helper function to improve readability. The runner could use an overhaul, and might later take on this functionality. --- run_tests.py | 21 ++++++--------------- test/util.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/run_tests.py b/run_tests.py index 17c9145..41fa2b3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -181,21 +181,7 @@ def main(): error_tracker.set_category(target) try: - # converts the 'target.torrc' csv into a list of test.runner.Torrc enums - config_csv = CONFIG["target.torrc"].get(target) - torrc_opts = [] - - if config_csv: - for opt in config_csv.split(','): - opt = opt.strip() - - if opt in test.runner.Torrc.keys(): - torrc_opts.append(test.runner.Torrc[opt]) - else: - println("'%s' isn't a test.runner.Torrc enumeration" % opt) - sys.exit(1) - - integ_runner.start(target, args.attribute_targets, args.tor_path, extra_torrc_opts = torrc_opts) + integ_runner.start(target, args.attribute_targets, args.tor_path, extra_torrc_opts = test.util.get_torrc_entries(target)) println("Running tests...\n", STATUS) @@ -219,6 +205,11 @@ def main(): except KeyboardInterrupt: println(" aborted starting tor: keyboard interrupt\n", ERROR) break + except ValueError, exc: + # can arise if get_torrc_entries() runs into a bad settings.cfg data + + println(exc, ERROR) + break except OSError: error_tracker.register_error() finally: diff --git a/test/util.py b/test/util.py index 12effd0..309851b 100644 --- a/test/util.py +++ b/test/util.py @@ -10,6 +10,7 @@ Helper functions for our test framework. get_integ_tests - provides our integration tests get_prereq - provides the tor version required to run the given target + get_torrc_entries - provides the torrc entries for a given target get_help_message - provides usage information for running our tests get_python3_destination - location where a python3 copy of stem is exported to get_stylistic_issues - checks for PEP8 and other stylistic issues @@ -56,6 +57,7 @@ CONFIG = stem.util.conf.config_dict("test", { "msg.help": "", "target.description": {}, "target.prereq": {}, + "target.torrc": {}, "pep8.ignore": [], "pyflakes.ignore": [], "integ.test_directory": "./test/data", @@ -174,6 +176,35 @@ def get_prereq(target): return None +def get_torrc_entries(target): + """ + Provides the torrc entries used to run the given target. + + :param Target target: target to provide the custom torrc contents of + + :returns: list of :class:`~test.runner.Torrc` entries for the given target + + :raises: **ValueError** if the target.torrc config has entries that don't map + to test.runner.Torrc + """ + + # converts the 'target.torrc' csv into a list of test.runner.Torrc enums + + config_csv = CONFIG["target.torrc"].get(target) + torrc_opts = [] + + if config_csv: + for opt in config_csv.split(','): + opt = opt.strip() + + if opt in test.runner.Torrc.keys(): + torrc_opts.append(test.runner.Torrc[opt]) + else: + raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) + + return torrc_opts + + def get_python3_destination(): """ Provides the location where a python 3 copy of stem is exported to for

1 0

[stem/master] Server descriptor digest validation failed for python 3
by atagar＠torproject.org 25 Apr '13

25 Apr '13

commit 92af5b8d50e3dac52e2380cd44ff706c88d9332e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 24 09:35:52 2013 -0700 Server descriptor digest validation failed for python 3 When validating the digest for server descriptors via python 3 we forgot to explicitly use byte values (rather than unicode). This is an adaptation of a patch from aj00200... https://trac.torproject.org/8755 --- docs/change_log.rst | 1 + stem/descriptor/server_descriptor.py | 21 ++++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index d9fe02e..5ddfcda 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -42,6 +42,7 @@ The following are only available within stem's `git repository * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (:trac:`8596`, :spec:`25b0d43`) * :func:`~stem.control.Controller.attach_stream` could encounter an undocumented 555 response (:trac:`8701`, :spec:`7286576`) + * :class:`~stem.descriptor.server_descriptor.RelayDescriptor` digest validation was broken with python 3 (:trac:`8755`) * **Website** diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 000b864..dc21813 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -17,7 +17,6 @@ etc). This information is provided from a few sources... ServerDescriptor - Tor server descriptor. |- RelayDescriptor - Server descriptor for a relay. - | +- is_valid - checks the signature against the descriptor content | |- BridgeDescriptor - Scrubbed server descriptor for a bridge. | |- is_scrubbed - checks if our content has been properly scrubbed @@ -30,6 +29,7 @@ etc). This information is provided from a few sources... """ import base64 +import codecs import datetime import hashlib import re @@ -649,9 +649,9 @@ class RelayDescriptor(ServerDescriptor): """ Provides the digest of our descriptor's content. - :raises: ValueError if the digest canot be calculated - :returns: the digest string encoded in uppercase hex + + :raises: ValueError if the digest canot be calculated """ if self._digest is None: @@ -743,7 +743,7 @@ class RelayDescriptor(ServerDescriptor): ############################################################################ try: - if decrypted_bytes.index('\x00\x01') != 0: + if decrypted_bytes.index(b'\x00\x01') != 0: raise ValueError("Verification failed, identifier missing") except ValueError: raise ValueError("Verification failed, malformed data") @@ -752,20 +752,15 @@ class RelayDescriptor(ServerDescriptor): identifier_offset = 2 # find the separator - seperator_index = decrypted_bytes.index('\x00', identifier_offset) + seperator_index = decrypted_bytes.index(b'\x00', identifier_offset) except ValueError: raise ValueError("Verification failed, seperator not found") - digest = decrypted_bytes[seperator_index + 1:] - - # The local digest is stored in uppercase hex; - # - so decode it from hex - # - and convert it to lower case - - local_digest = self.digest().lower().decode('hex') + digest = codecs.encode(decrypted_bytes[seperator_index + 1:], 'hex_codec').upper() + local_digest = self.digest() if digest != local_digest: - raise ValueError("Decrypted digest does not match local digest") + raise ValueError("Decrypted digest does not match local digest (calculated: %s, local: %s)" % (digest, local_digest)) def _parse(self, entries, validate): entries = dict(entries) # shallow copy since we're destructive

1 0

[tlsdate/master] Fix Linux builds
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit d691835f2225d1156826634507e654eb96aa3825 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:32:09 2013 -0700 Fix Linux builds --- configure.ac | 16 ++++++++-------- m4/ax_platform.m4 | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 56f7e27..182bf08 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,14 @@ case "$host" in [""|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 + AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system]) + AC_SUBST(HAVE_ANDROID, [1]) + HAVE_ANDROID="yes" + ;; + esac ;; *-cygwin*) dnl This is for Cygwin @@ -327,14 +335,6 @@ case "$host" in 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 - AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system]) - AC_SUBST(HAVE_ANDROID, [1]) - HAVE_ANDROID="yes" - ;; - esac ;; esac diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 76031d4..2d4285c 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -73,10 +73,10 @@ 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" + [TARGET_OS_OSX="true" AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], [*linux*], - [TARGET_LINUX="true" + [TARGET_OS_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"])

1 0

[tlsdate/master] Remove unused Makefile
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 9145ac5f3114309f24e1d1a0b0c10c7f14201cbb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:32:35 2013 -0700 Remove unused Makefile --- src/Makefile.am | 116 ------------------------------------------------------- 1 files changed, 0 insertions(+), 116 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index cd9802f..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -SUBDIRS = compat - -AUTOMAKE_OPTIONS = foreign 1.7 - -# Our main programs -if TARGET_LINUX -bin_PROGRAMS = tlsdate-routeup tlsdate tlsdate-helper \ - tlsdated tlsdated_unittest -endif - -if TARGET_FREEBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -if TARGET_NETBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -if TARGET_BSD -if !TARGET_FREEBSD -if !TARGET_NETBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif -endif -endif - -if TARGET_OSX -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -AM_CFLAGS = -fvisibility=hidden -if TARGET_LINUX -# Our main program -bin_PROGRAMS = tlsdate-routeup tlsdate tlsdate-helper \ - tlsdated tlsdated_unittest -if !POLARSSL -bin_PROGRAMS = $(bin_PROGRAMS) proxy_bio_unittest -endif -AM_CFLAGS = -fvisibility=hidden -if !POLARSSL -proxy_bio_unittest_SOURCES = proxy-bio.c proxy-bio-unittest.c test-bio.c util.c -proxy_bio_unittest_LDADD = -lssl -lcrypto -endif -tlsdate_routeup_SOURCES = routeup.c util.c -tlsdate_routeup_CFLAGS = $(AM_CFLAGS) -DROUTEUP_MAIN -endif - -tlsdate_SOURCES = tlsdate.c -tlsdate_helper_SOURCES = proxy-bio.c util.c tlsdate-helper.c - -if TARGET_LINUX -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_FREEBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_NETBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_BSD -if !TARGET_FREEBSD -if !TARGET_NETBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif -endif -endif - -if TARGET_OSX -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/.libs/libtlsdate_compat.dylib -endif - -if TARGET_LINUX -tlsdated_SOURCES = routeup.c tlsdated.c util.c -tlsdated_CFLAGS = $(AM_CFLAGS) -DTLSDATED_MAIN -tlsdated_unittest_SOURCES = routeup.c tlsdated-unittest.c util.c -endif - -if HAVE_ANDROID_SYSTEM -tlsdated_unittest_SOURCES += common/android.c common/fmemopen.c -endif - -if TARGET_NETBSD -tlsdated_unittest_SOURCES += common/android.c common/fmemopen.c -endif - -if TARGET_OSX -tlsdated_SOURCES = routeup.c tlsdated.c util.c -tlsdated_CFLAGS = $(AM_CFLAGS) -DTLSDATED_MAIN -endif - -if TARGET_LINUX -TESTS = tlsdated_unittest -if !POLARSSL -TESTS = $(TESTS) proxy_bio_unittest -endif - -# We're not shipping headers -noinst_HEADERS = tlsdate.h - -if HAVE_ANDROID_SYSTEM -noinst_HEADERS+= common/android.h -noinst_HEADERS+= common/fmemopen.h -endif - -if TARGET_NETBSD -noinst_HEADERS+= common/android.h -noinst_HEADERS+= common/fmemopen.h -endif

1 0

[tlsdate/master] Make ax_platform consistent in naming of targets
by ioerror＠torproject.org 25 Apr '13

25 Apr '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 files 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/master] Add basic GNU/Hurd build support
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 2f7224a11eddcc0d515cd168954eaff4b7baa0f8 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:57:17 2013 -0700 Add basic GNU/Hurd build support --- INSTALL | 9 +++++---- m4/ax_platform.m4 | 4 ++++ src/compat/clock.h | 4 ++++ src/compat/include.am | 4 ++++ src/include.am | 28 ++++++++++++++++++++++++++-- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 97ca73b..07bdcd9 100644 --- a/INSTALL +++ b/INSTALL @@ -18,21 +18,22 @@ tlsdate should build and work on the following Operating Systems: tlsdate should build and may work on the following Operating Systems: - Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) + Win32 with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3 + Win32 with MinGW Haiku r1alpha4 + GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.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 ports of tlsdate or for tlsdate integration on the following Operating Systems: - Win32 (MinGW or otherwise) + Windows native OpenWRT pfsense OpenVMS Irix - GNU/Hurd Minix - Any of the classic unix systems + Any of the other classic unix systems Currently porting is in progress or partially documented for: diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 2d4285c..e5baba5 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -75,6 +75,9 @@ [*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])]) @@ -84,6 +87,7 @@ 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_GNUHURD],[test "x${TARGET_OS_GNUHURD}" = "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"]) diff --git a/src/compat/clock.h b/src/compat/clock.h index 727940e..15f3223 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -42,6 +42,10 @@ struct tlsdate_time { struct timespec tp; #elif TARGET_OS_MINGW struct timespec tp; +#elif TARGET_OS_GNUHURD + struct timespec tp; +#else + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 55ebb61..55b6218 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -40,6 +40,10 @@ endif endif endif +if TARGET_GNUHURD +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_CYGWIN src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif diff --git a/src/include.am b/src/include.am index 3168a6c..f724f39 100644 --- a/src/include.am +++ b/src/include.am @@ -96,6 +96,17 @@ endif endif endif +if TARGET_GNUHURD +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_CYGWIN bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -277,6 +288,19 @@ endif endif endif +if TARGET_GNUHURD +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 + if TARGET_CYGWIN if !POLARSSL src_proxy_bio_unittest_LDADD = @SSL_LIBS@ @@ -335,7 +359,6 @@ endif # This is our explicit target list # We do not attempt to build with PolarSSL if !POLARSSL -if !TARGET_HAIKU if !TARGET_LINUX if !TARGET_OSX if !TARGET_OPENBSD @@ -343,6 +366,7 @@ if !TARGET_NETBSD if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU +if !TARGET_GNUHURD if !TARGET_CYGWIN if !TARGET_MINGW if !TARGET_BSD @@ -368,7 +392,6 @@ endif endif if !POLARSSL -if !TARGET_HAIKU if !TARGET_LINUX if !TARGET_OSX if !TARGET_OPENBSD @@ -376,6 +399,7 @@ if !TARGET_NETBSD if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU +if !TARGET_GNUHURD if !TARGET_CYGWIN if !TARGET_MINGW if !TARGET_BSD

1 0

[tlsdate/master] Fixup windows build target for mingw
by ioerror＠torproject.org 25 Apr '13

25 Apr '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 files changed, 1 insertions(+), 1 deletions(-) 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

[tlsdate/master] Start MinGW support
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 63218359eb051fa76bd7788e369bc5c0583f0d64 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 18:44:39 2013 -0700 Start MinGW support --- INSTALL | 1 + autogen.sh | 2 +- configure.ac | 17 +++++++++++++++++ m4/ax_platform.m4 | 4 ++++ src/compat/clock.h | 2 ++ src/compat/include.am | 4 ++++ src/include.am | 28 ++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index ebe01c4..97ca73b 100644 --- a/INSTALL +++ b/INSTALL @@ -37,6 +37,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) + MingGW Building and install of tlsdate on GNU/Linux and FreeBSD: diff --git a/autogen.sh b/autogen.sh index 51c926a..efdcacc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,7 +23,7 @@ then export WARNINGS fi -if [ $(uname) != "CYGWIN_NT-6.1" ]; +if [ $(uname) = "CYGWIN_NT-6.1" ] || [ $(uname) = "MINGW32_NT-6.1" ]; then WARNINGS="" export WARNINGS diff --git a/configure.ac b/configure.ac index b3e7df1..56f7e27 100644 --- a/configure.ac +++ b/configure.ac @@ -291,6 +291,23 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *-mingw32*) + dnl This is for MINGW32_NT + 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]) + ;; *-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 diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 6e43ab8..76031d4 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -47,6 +47,9 @@ # define SHUT_RDWR SD_BOTH #endif ])], + [*mingw*], + [TARGET_OS_MINGW="true" + AC_DEFINE([TARGET_OS_MINGW],[1],[Whether we build for MinGW])], [*cygwin*], [TARGET_OS_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], @@ -77,6 +80,7 @@ AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_MINGW],[test "x${TARGET_OS_MINGW}" = "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"]) diff --git a/src/compat/clock.h b/src/compat/clock.h index e8220bd..727940e 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -40,6 +40,8 @@ struct tlsdate_time { struct timespec tp; #elif TARGET_OS_CYGWIN struct timespec tp; +#elif TARGET_OS_MINGW + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 9623362..55ebb61 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -44,6 +44,10 @@ if TARGET_CYGWIN src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_MINGW +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 diff --git a/src/include.am b/src/include.am index a045759..3168a6c 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_MINGW +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_HAIKU bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -279,6 +290,19 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_MINGW +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 + if TARGET_HAIKU if !POLARSSL src_proxy_bio_unittest_LDADD = @SSL_LIBS@ @@ -320,6 +344,7 @@ if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU if !TARGET_CYGWIN +if !TARGET_MINGW if !TARGET_BSD bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -340,6 +365,7 @@ endif endif endif endif +endif if !POLARSSL if !TARGET_HAIKU @@ -351,6 +377,7 @@ if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU if !TARGET_CYGWIN +if !TARGET_MINGW if !TARGET_BSD src_proxy_bio_unittest_LDADD = @SSL_LIBS@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c @@ -371,6 +398,7 @@ endif endif endif endif +endif if !TARGET_OSX check_PROGRAMS+= src/test/proxy-override src/test/return-argc \

1 0

[tor/master] Treat a changed IPv6 ORPort like an IPv4 one in retry_all_listeners()
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit 07e26005a6cb7e47f1f90fcf6a377dfaaaa56789 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 17:20:43 2013 -0400 Treat a changed IPv6 ORPort like an IPv4 one in retry_all_listeners() Fix for bug 6026 --- changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/changes/bug6026 b/changes/bug6026 new file mode 100644 index 0000000..de5d6ea --- /dev/null +++ b/changes/bug6026 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Relays now treat a changed IPv6 ORPort as sufficient reason to + publish an updated descriptor. Fix for bug 6026; bugfix for + 0.2.4.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 15138f9..1c48c66 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5561,7 +5561,8 @@ get_first_listener_addrport_string(int listener_type) to iterate all listener connections and find out in which port it ended up listening: */ if (cfg->port == CFG_AUTO_PORT) { - port = router_get_active_listener_port_by_type(listener_type); + port = router_get_active_listener_port_by_type_af(listener_type, + tor_addr_family(&cfg->addr)); if (!port) return NULL; } else { diff --git a/src/or/connection.c b/src/or/connection.c index c659e65..5812d83 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2054,6 +2054,8 @@ retry_all_listeners(smartlist_t *replaced_conns, const or_options_t *options = get_options(); int retval = 0; const uint16_t old_or_port = router_get_advertised_or_port(options); + const uint16_t old_or_port_ipv6 = + router_get_advertised_or_port_by_af(options,AF_INET6); const uint16_t old_dir_port = router_get_advertised_dir_port(options, 0); SMARTLIST_FOREACH_BEGIN(get_connection_array(), connection_t *, conn) { @@ -2082,8 +2084,9 @@ retry_all_listeners(smartlist_t *replaced_conns, smartlist_free(listeners); - /* XXXprop186 should take all advertised ports into account */ if (old_or_port != router_get_advertised_or_port(options) || + old_or_port_ipv6 != router_get_advertised_or_port_by_af(options, + AF_INET6) || old_dir_port != router_get_advertised_dir_port(options, 0)) { /* Our chosen ORPort or DirPort is not what it used to be: the * descriptor we had (if any) should be regenerated. (We won't diff --git a/src/or/router.c b/src/or/router.c index 422fe5d..91de221 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1459,13 +1459,18 @@ consider_publishable_server(int force) /** XXX not a very good interface. it's not reliable when there are multiple listeners. */ uint16_t -router_get_active_listener_port_by_type(int listener_type) +router_get_active_listener_port_by_type_af(int listener_type, + sa_family_t family) { /* Iterate all connections, find one of the right kind and return the port. Not very sophisticated or fast, but effective. */ - const connection_t *c = connection_get_by_type(listener_type); - if (c) - return c->port; + smartlist_t *conns = get_connection_array(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { + if (conn->type == listener_type && !conn->marked_for_close && + conn->socket_family == family) { + return conn->port; + } + } SMARTLIST_FOREACH_END(conn); return 0; } @@ -1477,13 +1482,24 @@ router_get_active_listener_port_by_type(int listener_type) uint16_t router_get_advertised_or_port(const or_options_t *options) { - int port = get_primary_or_port(); + return router_get_advertised_or_port_by_af(options, AF_INET); +} + +/** As router_get_advertised_or_port(), but allows an address family argument. + */ +uint16_t +router_get_advertised_or_port_by_af(const or_options_t *options, + sa_family_t family) +{ + int port = get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, + family); (void)options; /* If the port is in 'auto' mode, we have to use router_get_listener_port_by_type(). */ if (port == CFG_AUTO_PORT) - return router_get_active_listener_port_by_type(CONN_TYPE_OR_LISTENER); + return router_get_active_listener_port_by_type_af(CONN_TYPE_OR_LISTENER, + family); return port; } @@ -1503,7 +1519,8 @@ router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport) return dirport; if (dirport_configured == CFG_AUTO_PORT) - return router_get_active_listener_port_by_type(CONN_TYPE_DIR_LISTENER); + return router_get_active_listener_port_by_type_af(CONN_TYPE_DIR_LISTENER, + AF_INET); return dirport_configured; } diff --git a/src/or/router.h b/src/or/router.h index fd2076a..dc894d1 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -58,8 +58,11 @@ int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); -uint16_t router_get_active_listener_port_by_type(int listener_type); +uint16_t router_get_active_listener_port_by_type_af(int listener_type, + sa_family_t family); uint16_t router_get_advertised_or_port(const or_options_t *options); +uint16_t router_get_advertised_or_port_by_af(const or_options_t *options, + sa_family_t family); uint16_t router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport);

1 0

[tor/master] Merge remote-tracking branch 'public/bug6026' into maint-0.2.4
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit f8bb0064d6a06770e6187ba57a2f4a764336aa84 Merge: cab5f82 07e2600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 24 22:15:47 2013 -0400 Merge remote-tracking branch 'public/bug6026' into maint-0.2.4 changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-)

1 0