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

[torsocks/master] Fix: set loopback check in host byte order
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit c5a7493bbdff681ba6be440d39891c090a5b1345 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Nov 7 20:37:11 2013 -0500 Fix: set loopback check in host byte order Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 5 +++-- src/lib/connect.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index faadfdb..f8e241e 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -103,10 +103,11 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); /* * Shamelessly taken from linux/in.h of the libc. This is consider trivial code - * by the GPL license thus copying it as is should be OK. + * by the GPL license thus copying it as is should be OK. Slight modification + * was made to make the check in host byte order. */ #ifndef IN_LOOPBACK -#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000) +#define IN_LOOPBACK(a) ((((long int) (a)) & 0x000000ff) == 0x0000007f) #endif #endif /* TORSOCKS_COMPAT_H */ diff --git a/src/lib/connect.c b/src/lib/connect.c index 09d3be6..ab2e082 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -73,7 +73,7 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) /* Check if address is local IPv4. */ if (__addr->sa_family == AF_INET && - utils_is_ipv4_local(be32toh(inet_addr->sin_addr.s_addr))) { + utils_is_ipv4_local(inet_addr->sin_addr.s_addr)) { WARN("[connect] Connection to a local address are denied since it " "might be a TCP DNS query to a local DNS server. " "Rejecting it for safety reasons.");

1 0

[torsocks/master] Fix: change non TCP socket warning to debug
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 31cbca3d898e2a309bee335b49777ff650f3dc99 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Nov 9 10:58:01 2013 -0500 Fix: change non TCP socket warning to debug A fat comment is added to explain why this is done. :) CC: adrelanos <adrelanos(a)riseup.net> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/socket.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/socket.c b/src/lib/socket.c index dcc0444..2a50c3e 100644 --- a/src/lib/socket.c +++ b/src/lib/socket.c @@ -43,7 +43,16 @@ LIBC_SOCKET_RET_TYPE tsocks_socket(LIBC_SOCKET_SIG) break; default: if (__domain == AF_INET || __domain == AF_INET6) { - WARN("Non TCP inet socket denied. Tor network can't handle it."); + /* + * Print this message only in debug mode. Very often, applications + * uses the libc to do DNS resolution which first tries with UDP + * and then with TCP. It's not critical for the user to know that a + * non TCP socket has been denied and since the libc has a fallback + * that works, this message most of the time, simply polutes the + * application's output which can cause issues with external + * applications parsing the output. + */ + DBG("Non TCP inet socket denied. Tor network can't handle it."); errno = EINVAL; return -1; }

1 0

[torsocks/master] Fix: add a library cleanup flag
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit aa7b569c5db43239a26ed1ed5703b1043536fb07 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Nov 10 21:15:47 2013 -0500 Fix: add a library cleanup flag This flag is used to make sure we don't cleanup torsocks twice which could lead to out of bound memory access. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.c | 9 +++++++++ src/lib/torsocks.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index f1de9c5..d97a598 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -47,6 +47,9 @@ struct configuration tsocks_config; */ struct onion_pool tsocks_onion_pool; +/* Indicate if the library was cleaned up previously. */ +unsigned int tsocks_cleaned_up = 0; + /* * Set to 1 if the binary is set with suid or 0 if not. This is set once during * initialization so after that it can be read without any protection. @@ -530,10 +533,16 @@ void *tsocks_find_libc_symbol(const char *symbol, */ void tsocks_cleanup(void) { + if (tsocks_cleaned_up) { + return; + } + /* Cleanup every entries in the onion pool. */ onion_pool_destroy(&tsocks_onion_pool); /* Cleanup allocated memory in the config file. */ config_file_destroy(&tsocks_config.conf_file); /* Clean up logging. */ log_destroy(); + + tsocks_cleaned_up = 1; } diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index c5466a1..3e82a94 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -337,6 +337,8 @@ extern struct configuration tsocks_config; /* Global pool for .onion address. Initialized once in the constructor. */ extern struct onion_pool tsocks_onion_pool; +extern unsigned int tsocks_cleaned_up; + int tsocks_connect_to_tor(struct connection *conn); void *tsocks_find_libc_symbol(const char *symbol, enum tsocks_sym_action action);

1 0

[torsocks/master] Fix: overload _exit and _Exit to cleanup library
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit ebd68449a67a514819daa1e263f936806c1fd60b Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Nov 10 20:48:37 2013 -0500 Fix: overload _exit and _Exit to cleanup library Some application directly calls _exit (or exit_group on Linux) like SSH does when a DNS name resolution fails. Those two functions don't call the library destructor thus not cleaning the library cleanly. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/Makefile.am | 3 +- src/lib/exit.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.c | 20 +++++++++---- src/lib/torsocks.h | 1 + 4 files changed, 94 insertions(+), 7 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f7320e3..dbf8c77 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,7 +8,8 @@ lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ connect.c gethostbyname.c getaddrinfo.c close.c \ - getpeername.c socket.c syscall.c socketpair.c recv.c + getpeername.c socket.c syscall.c socketpair.c recv.c \ + exit.c libtorsocks_la_LIBADD = $(top_builddir)/src/common/libcommon.la if ! HAVE_BUILTIN_DL diff --git a/src/lib/exit.c b/src/lib/exit.c new file mode 100644 index 0000000..ce4655f --- /dev/null +++ b/src/lib/exit.c @@ -0,0 +1,77 @@ +/* + * Copyright (C) - 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <dlfcn.h> +#include <stdlib.h> +#include <unistd.h> + +#include "torsocks.h" + +/* + * _exit() and _Exit are hijacked here so we can cleanup torsocks library + * safely since the constructor is *not* called for these functions. + */ + +void _exit(int status) +{ + static void (*plibc_func)(int) = NULL; + + if (plibc_func == NULL) { + plibc_func = dlsym(RTLD_NEXT, "_exit"); + if (plibc_func == NULL) { + ERR("unable to find \"_exit\" symbol"); + errno = ENOSYS; + } + } + + tsocks_cleanup(); + + if (plibc_func) { + plibc_func(status); + } + + /* + * This should never be reached but for the sake of the compiler + * not complaining, this function MUST never return. + */ + abort(); +} + +void _Exit(int status) +{ + static void (*plibc_func)(int) = NULL; + + if (plibc_func == NULL) { + plibc_func = dlsym(RTLD_NEXT, "_Exit"); + if (plibc_func == NULL) { + ERR("unable to find \"_Exit\" symbol"); + errno = ENOSYS; + } + } + + tsocks_cleanup(); + + if (plibc_func) { + plibc_func(status); + } + + /* + * This should never be reached but for the sake of the compiler + * not complaining, this function MUST never return. + */ + abort(); +} diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 332c561..f1de9c5 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -242,12 +242,7 @@ static void __attribute__((constructor)) tsocks_init(void) */ static void __attribute__((destructor)) tsocks_exit(void) { - /* Cleanup every entries in the onion pool. */ - onion_pool_destroy(&tsocks_onion_pool); - /* Cleanup allocated memory in the config file. */ - config_file_destroy(&tsocks_config.conf_file); - /* Clean up logging. */ - log_destroy(); + tsocks_cleanup(); } /* @@ -529,3 +524,16 @@ void *tsocks_find_libc_symbol(const char *symbol, return fct_ptr; } + +/* + * Cleanup torsocks library memory and open fd. + */ +void tsocks_cleanup(void) +{ + /* Cleanup every entries in the onion pool. */ + onion_pool_destroy(&tsocks_onion_pool); + /* Cleanup allocated memory in the config file. */ + config_file_destroy(&tsocks_config.conf_file); + /* Clean up logging. */ + log_destroy(); +} diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index d724a77..c5466a1 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -342,5 +342,6 @@ void *tsocks_find_libc_symbol(const char *symbol, enum tsocks_sym_action action); int tsocks_tor_resolve(const char *hostname, uint32_t *ip_addr); int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af); +void tsocks_cleanup(void); #endif /* TORSOCKS_H */

1 0

[torsocks/master] Fix: typo in exit.c comment
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 380c399776778958700b055eac31420997d52a39 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Nov 10 21:27:22 2013 -0500 Fix: typo in exit.c comment Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/exit.c b/src/lib/exit.c index ce4655f..f1560f3 100644 --- a/src/lib/exit.c +++ b/src/lib/exit.c @@ -23,7 +23,7 @@ /* * _exit() and _Exit are hijacked here so we can cleanup torsocks library - * safely since the constructor is *not* called for these functions. + * safely since the destructor is *not* called for these functions. */ void _exit(int status)

1 0

[torsocks/master] Add hardening compile and linker flags
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 006178a0362b08252fccf5e1a7981e1f089616d1 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Nov 12 00:21:09 2013 -0500 Add hardening compile and linker flags Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 4 ++- config/ax_check_compile_flag.m4 | 72 +++++++++++++++++++++++++++++++++++++++ config/ax_check_link_flag.m4 | 71 ++++++++++++++++++++++++++++++++++++++ configure.ac | 18 ++++++++++ 4 files changed, 164 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9739a6f..eb70007 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,9 @@ missing stamp-h1 tags -config/* +config/ +!config/ax_check_compile_flag.m4 +!config/ax_check_link_flag .m4 doc/torsocks.1 doc/torsocks.8 diff --git a/config/ax_check_compile_flag.m4 b/config/ax_check_compile_flag.m4 new file mode 100644 index 0000000..c3a8d69 --- /dev/null +++ b/config/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/config/ax_check_link_flag.m4 b/config/ax_check_link_flag.m4 new file mode 100644 index 0000000..e2d0d36 --- /dev/null +++ b/config/ax_check_link_flag.m4 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the linker or gives an error. +# (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_LINK_FLAG], +[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl +AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS $4 $1" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + LDFLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_LINK_FLAGS diff --git a/configure.ac b/configure.ac index 7cdf462..3cfda8f 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,24 @@ AC_SUBST(TESTLDFLAGS) # Version information for libtorsocks TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0" +# Check for the gcc hardening flags. +AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[]) +AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[]) +AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], + [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[]) +AX_CHECK_COMPILE_FLAG([-fstack-protector-all], + [CFLAGS="$CFLAGS -fstack-protector-all"],[],[] +) +AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], + [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[] +) + +dnl Add hardening linker flags +AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[]) +AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[]) +AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[]) +LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2" + dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES dnl instead of LD_PRELOAD case "$host_os" in

1 0

[torsocks/master] Fix: quote torsocks script shell arguments
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 50a6aba54f60bb91e91270d91b38984eac19f649 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Dec 9 17:07:18 2013 -0500 Fix: quote torsocks script shell arguments Reported-by: Jérémy Bobbio <lunar(a)debian.org> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/bin/torsocks.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index aebd2d4..9abc5e8 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -172,6 +172,6 @@ case "$1" in echo "Torsocks @VERSION@" ;; *) - torify_app $@ + torify_app "$@" ;; esac

1 0

[torsocks/master] Tests: add travis build status image to README
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit d257cbb259019f40e553c6fbdfc84db8e0e120c6 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Dec 9 17:15:01 2013 -0500 Tests: add travis build status image to README Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index c3d7c8b..3f0a594 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/dgoulet/torsocks.png)](https://travis-ci.org/… + What is torsocks? -----------------

1 0

[torsocks/master] Fix: cleanup configure.ac and add missing headers/functions
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 97fe939aa3dfce59d5e6af1b69c91e7e0b2f36fd Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Nov 11 19:44:21 2013 -0500 Fix: cleanup configure.ac and add missing headers/functions Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 131 ++++++++++++++++++++++++++------------------------- src/lib/Makefile.am | 3 -- 2 files changed, 66 insertions(+), 68 deletions(-) diff --git a/configure.ac b/configure.ac index a6b7138..7cdf462 100644 --- a/configure.ac +++ b/configure.ac @@ -32,31 +32,28 @@ dnl Check if the C compiler accepts -Wall AC_MSG_CHECKING(if the C compiler accepts -Wall) OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall" -AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - CFLAGS="$OLDCFLAGS" - AC_MSG_RESULT(no)]) +AC_TRY_COMPILE(,, + [AC_MSG_RESULT(yes)], + [ + CFLAGS="$OLDCFLAGS" + AC_MSG_RESULT(no) + ] +) dnl Checks for standard header files. AC_HEADER_STDC -dnl Check for the dynamic loader function header -AC_CHECK_HEADER(dlfcn.h,,AC_MSG_ERROR("dlfcn.h not found")) - -dnl Check for the socket header -AC_CHECK_HEADER(sys/socket.h,,AC_MSG_ERROR("sys/socket.h not found")) - -dnl Check for the arpa/inet.h header (inet_ntoa and inet_addr) -AC_CHECK_HEADER(arpa/inet.h,,AC_MSG_ERROR("arpa/inet.h not found")) - -dnl Check for the fcntl header -AC_CHECK_HEADER(fcntl.h,,AC_MSG_ERROR("fcntl.h not found")) - -dnl Other headers we're interested in -AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(dlfcn.h sys/syscall.h sys/socket.h arpa/inet.h \ + assert.h netdb.h errno.h stdarg.h time.h,, + [AC_MSG_ERROR("Required header not found")] +) dnl Checks for required library functions. -AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ - strncasecmp strtol,,[AC_MSG_ERROR("Required function not found")]) +AC_CHECK_FUNCS(strcspn strdup strerror strcasecmp strncasecmp mmap munmap \ + socket connect close syscall recv send memset memcpy strlen \ + strncpy strcmp malloc calloc strstr strtoul free,, + [AC_MSG_ERROR("Required function not found")] +) ############################################################################## # 3. Determine libraries we need to include when linking libtorsocks. @@ -65,54 +62,55 @@ AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ # in torsocks.c and elsewhere is platform-dependent. ############################################################################## -dnl Check for socket -AC_CHECK_FUNC(socket,, [ - AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) - dnl Check for a function to convert an ascii ip address dnl to a sin_addr. -AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ - AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), [ - AC_CHECK_LIB(nsl, inet_addr, [ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) - LIBS="${LIBS} -lnsl" ], [ - AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) - +AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), + [AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), + [AC_CHECK_LIB(nsl, inet_addr, + [ + AC_DEFINE([HAVE_INET_ADDR],[],[Description]) + LIBS="${LIBS} -lnsl" + ], + [AC_MSG_ERROR("Neither inet_aton or inet_addr present")] + )] + )] +) dnl Look for gethostbyname (needed by torsocks) -AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_MSG_ERROR(["gethostbyname not found, name lookups in " \ - "torsocks disabled"])])]) - +AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), + [AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), + [AC_MSG_ERROR(["gethostbyname not found, name lookups in torsocks disabled"])] + )] +) -dnl Do we have dlopen(3) without -ldl? -AC_CHECK_FUNC([dlopen], [have_builtin_dl=yes]) -AM_CONDITIONAL([HAVE_BUILTIN_DL], [test "$have_builtin_dl" = "yes"]) +dnl Do we have dlopen(3) in libdl? +AC_SEARCH_LIBS([dlopen], [dl],, + [AC_MSG_ERROR("dlopen function not found in libdl")] +) dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. case $host in *-*-openbsd*) - AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") - AC_SEARCH_LIBS(pthread_create, [pthread]) - AC_SEARCH_LIBS(pthread_detach, [pthread]) - ;; + AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") + AC_SEARCH_LIBS(pthread_create, [pthread]) + ;; *-*-freebsd*) - AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") - ;; + AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") + ;; *-*-darwin*) - dnl Needed to compile tests. - dnl See https://bugs.g10code.com/gnupg/issue1292: - dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution - dnl services fail to compile. This is a result of the addition of BIND9 compatible - dnl resolution libraries on OS X that are being picked up by the configure script - dnl instead of -lresolv causing the tests for useable resolution services to fail - dnl thus disabling features like pka auto lookup." - LIBS="-lresolv $LIBS" - ;; + dnl Needed to compile tests. + dnl See https://bugs.g10code.com/gnupg/issue1292: + dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution + dnl services fail to compile. This is a result of the addition of BIND9 compatible + dnl resolution libraries on OS X that are being picked up by the configure script + dnl instead of -lresolv causing the tests for useable resolution services to fail + dnl thus disabling features like pka auto lookup." + LIBS="-lresolv $LIBS" + ;; esac if test "x${enable_envconf}" = "x"; then - AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) + AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) fi dnl Get libc full system path. Use prefix or some hardcoded standard @@ -154,9 +152,12 @@ darwin*) AC_MSG_CHECKING(if the linker accepts -dynamiclib) OLDLDFLAGS="$TORSOCKSLDFLAGS" TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -dynamiclib" - AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - TORSOCKSLDFLAGS="$OLDLDFLAGS" - AC_MSG_RESULT(no)]) + AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes)], + [ + TORSOCKSLDFLAGS="$OLDLDFLAGS" + AC_MSG_RESULT(no) + ] + ) # dnl Check if the linker accepts -multiply_defined suppress; necessary on Mac OS X # AC_MSG_CHECKING(if the linker accepts -multiply_defined suppress) @@ -173,16 +174,16 @@ darwin*) LDPRELOAD="LD_PRELOAD" TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -single_module" AC_TRY_COMPILE(,, - [ - SHLIB_EXT="dylib" - LDPRELOAD="DYLD_INSERT_LIBRARIES" - AC_MSG_RESULT(yes) - ], [ - TORSOCKSLDFLAGS="$OLDLDFLAGS" - AC_MSG_RESULT(no) - ] + [ + SHLIB_EXT="dylib" + LDPRELOAD="DYLD_INSERT_LIBRARIES" + AC_MSG_RESULT(yes) + ], + [ + TORSOCKSLDFLAGS="$OLDLDFLAGS" + AC_MSG_RESULT(no) + ] ) - ;; *) SHLIB_EXT="so" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index dbf8c77..ad25f8c 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -12,6 +12,3 @@ libtorsocks_la_SOURCES = torsocks.c torsocks.h \ exit.c libtorsocks_la_LIBADD = $(top_builddir)/src/common/libcommon.la -if ! HAVE_BUILTIN_DL -libtorsocks_la_LIBADD += -ldl -endif

1 0

[torsocks/master] Add --version to torsocks.in
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 7719ee4f6a320cb812c8c5fbafea35526e567642 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Nov 12 22:49:19 2013 -0500 Add --version to torsocks.in Fixes #19 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/bin/torsocks.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index 61fb593..aebd2d4 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -121,7 +121,8 @@ usage () echo "" echo "Options:" echo " -h, --help Show this help" - echo " , --shell Spawn a torified shell" + echo " --shell Spawn a torified shell" + echo " --version Show version" echo " on, off Add or remove torsocks library from @LDPRELOAD@" echo " show, sh Show the current value of the @LDPRELOAD@" echo "" @@ -167,6 +168,9 @@ case "$1" in --shell) tor_shell ;; + --version) + echo "Torsocks @VERSION@" + ;; *) torify_app $@ ;;

1 0