--- gvpe/configure.ac 2004/06/19 14:16:55 1.32 +++ gvpe/configure.ac 2013/07/18 13:35:19 1.63 @@ -1,10 +1,10 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.59) +AC_PREREQ(2.69) AC_INIT -AC_CONFIG_SRCDIR([src/vped.C]) +AC_CONFIG_SRCDIR([src/gvpe.C]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gvpe, 1.7) +AM_INIT_AUTOMAKE(gvpe, 2.25) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -19,26 +19,34 @@ ]) AH_BOTTOM([ +typedef unsigned char u8; +typedef signed char s8; + #if __CYGWIN__ -typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; +typedef signed short s16; +typedef signed int s32; #else #include /* old modula-2 habits */ -typedef unsigned char u8; typedef uint16_t u16; typedef uint32_t u32; +typedef int16_t s16; +typedef int32_t s32; #endif #endif -]) -dnl Include the macros from the m4/ directory -AM_ACLOCAL_INCLUDE(m4) +#if HAVE_CLOCALE +# define CLOCALE +#else +# define CLOCALE +#endif +]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.11.5) @@ -46,7 +54,7 @@ # Enable GNU extensions. # Define this here, not in acconfig's @TOP@ section, since definitions # in the latter don't make it into the configure-time tests. -AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions]) +AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extensions]) # do NOT define POSIX_SOURCE, sicne this clashes with many BSDs dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions]) @@ -55,7 +63,6 @@ ALL_LINGUAS="" dnl Checks for programs. -AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_PROG_GCC_TRADITIONAL @@ -68,17 +75,21 @@ AC_ARG_ENABLE(iftype, [AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE, Use kernel/net device interface TYPE/SUBTYPE. - Working combinations are: + Working combinations are (see doc/gvpe.osdep.5.pod): "native/linux" "tincd/linux" + "tincd/netbsd" "tincd/freebsd" "tincd/openbsd" + "native/darwin" "tincd/darwin" "native/cygwin"; Untested combinations are: - "tincd/netbsd" + "tincd/bsd" "tincd/solaris" - "tincd/mingw"; + "tincd/mingw" + "tincd/raw_socket" + "tincd/uml_socket"; Broken combinations are: "tincd/cygwin"; The default is to autodetect. @@ -105,7 +116,7 @@ AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD]) ;; *darwin*) - IFTYPE=tincd + IFTYPE=native IFSUBTYPE=darwin AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)]) ;; @@ -145,7 +156,7 @@ dnl Checks for libraries. AC_LANG(C++) -AC_CHECK_HEADERS(ext/hash_map) +AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale) dnl Checks for header files. AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ @@ -213,6 +224,9 @@ AC_CHECK_LIB(nsl, gethostbyname) ]) +dnl libev support +m4_include([libev/libev.m4]) + AC_LANG_POP dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo]) @@ -228,71 +242,123 @@ fi dnl tinc_ZLIB +AC_ARG_ENABLE(threads, + [AS_HELP_STRING(--enable-threads,try to use threads for long-running asynchronous operations (default enabled).)], + [try_threads=$enableval], + [try_threads=yes] +) + +if test "x$try_threads" = xyes; then + AC_CHECK_HEADER(pthread.h,[ + LIBS="$LIBS -lpthread" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include ], [pthread_t id; pthread_create (&id, 0, 0, 0);])], + [AC_DEFINE_UNQUOTED(ENABLE_PTHREADS, 1, [POSIX thread support.])] + ) + ]) +fi + AC_ARG_ENABLE(static-daemon, [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)], [LDFLAGS_DAEMON=-static] ) AC_SUBST(LDFLAGS_DAEMON) -AC_ARG_ENABLE(rohc, - [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)], - [ - echo - echo "**********************************************************************" - echo "**********************************************************************" - echo "**** --enable-rohc is highly experimental, do not use ****************" - echo "**********************************************************************" - echo "**********************************************************************" - echo - rohc=true - AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support]) - ] -) +dnl AC_ARG_ENABLE(rohc, +dnl [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)], +dnl [ +dnl echo +dnl echo "**********************************************************************" +dnl echo "**********************************************************************" +dnl echo "**** --enable-rohc is highly experimental, do not use ****************" +dnl echo "**********************************************************************" +dnl echo "**********************************************************************" +dnl echo +dnl rohc=true +dnl AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support]) +dnl ] +dnl ) AM_CONDITIONAL(ROHC, test x$rohc = xtrue) +dnl AC_ARG_ENABLE(bridging, +dnl [AS_HELP_STRING(--enable-bridging,enable bridging support (default disabled).)], +dnl AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.]) +dnl ) + +ICMP=1 AC_ARG_ENABLE(icmp, - [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)], - AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) + [AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)], + if test "x$enableval" = xno; then + ICMP=0 + fi ) +if test "x$ICMP" = x1; then + AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) +fi +TCP=1 AC_ARG_ENABLE(tcp, - [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)], + [AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)], + if test "x$enableval" = xno; then + TCP=0 + fi +) +if test "x$TCP" = x1; then AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.]) +fi + +HTTP=1 +AC_ARG_ENABLE(http-proxy, + [AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)], + if test "x$enableval" = xno; then + HTTP=0 + fi ) +if test "x$HTTP" = x1; then + AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) +fi AC_ARG_ENABLE(dns, - [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)], - AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.]) + [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)], + [ + AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])]) + AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])]) + + AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.]) + ] ) -AC_ARG_ENABLE(http-proxy, - [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)], - AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) +RSA=3072 +AC_ARG_ENABLE(rsa-length, + [AS_HELP_STRING(--enable-rsa-length=BITS,[ + use BITS rsa keys (default 3072). Allowed values are 2048-10240.])], + RSA=$enableval ) +AC_DEFINE_UNQUOTED(RSABITS, $RSA, [Size of RSA keys.]) -HMAC=12 +HMACSIZE=12 AC_ARG_ENABLE(hmac-length, [AS_HELP_STRING(--enable-hmac-length=BYTES,[ use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])], - HMAC=$enableval + HMACSIZE=$enableval ) -AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.]) +AC_DEFINE_UNQUOTED(HMACLENGTH, $HMACSIZE, [Size of HMAC in each packet in bytes.]) -RAND=8 +RANDSIZE=12 AC_ARG_ENABLE(rand-length, [AS_HELP_STRING(--enable-rand-length=BYTES, - [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])], - RAND=$enableval + [use BYTES bytes of extra randomness (default 12). Allowed values are 0, 4, 8, 12.])], + RANDSIZE=$enableval ) -AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.]) +AC_DEFINE_UNQUOTED(RAND_SIZE, $RANDSIZE, [Add this many bytes of randomness to each packet.]) MTU=1500 -AC_ARG_ENABLE(mtu, +AC_ARG_ENABLE(max-mtu, [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)], MTU=$enableval ) -AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.]) +AC_DEFINE_UNQUOTED(MAX_MTU, ($MTU + 14), [Maximum MTU supported.]) COMPRESS=1 AC_ARG_ENABLE(compression, @@ -303,37 +369,53 @@ ) AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.]) -CIPHER=bf_cbc +CIPHER=aes_128_cbc AC_ARG_ENABLE(cipher, - [AS_HELP_STRING(--enable-cipher,[ - Select the symmetric cipher (default "bf"). - Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])], - if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi - if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi - if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi - if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi + [AS_HELP_STRING(--enable-cipher=CIPHER,[ + Select the symmetric cipher (default "aes-128"). + Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192", "aes-256", "camellia-128" or "camellia-256".])], + if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi + if test "x$enableval" = xaes-128 ; then CIPHER=aes_128_cbc ; fi + if test "x$enableval" = xaes-192 ; then CIPHER=aes_192_cbc ; fi + if test "x$enableval" = xaes-256 ; then CIPHER=aes_256_cbc ; fi + if test "x$enableval" = xcamellia-128; then CIPHER=camellia_128_cbc; fi + if test "x$enableval" = xcamellia-256; then CIPHER=camellia_256_cbc; fi ) AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.]) -DIGEST=sha1 -AC_ARG_ENABLE(digest, - [AS_HELP_STRING(--enable-digest,[ - Select the digets algorithm to use (default "sha1"). Must be one of - "sha1", "ripemd160", "md5" or "md4" (insecure).])], - if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi - if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi - if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi - if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi +HMAC=sha1 +AC_ARG_ENABLE(hmac-digest, + [AS_HELP_STRING(--enable-hmac-digest=HMAC,[ + Select the HMAC digest algorithm to use (default "sha1"). Must be one of + "sha512", "sha256", "sha1", "ripemd160", "whirlpool".])], + if test "x$enableval" = xwhirlpool; then HMAC=whirlpool; fi + if test "x$enableval" = xsha512 ; then HMAC=sha512 ; fi + if test "x$enableval" = xsha256 ; then HMAC=sha256 ; fi + if test "x$enableval" = xsha1 ; then HMAC=sha1 ; fi + if test "x$enableval" = xripemd160; then HMAC=ripemd160; fi +) +AC_DEFINE_UNQUOTED(ENABLE_HMAC, EVP_${HMAC}, [Select the HMAC digest algorithm to use.]) + +AUTH=sha512 +AC_ARG_ENABLE(auth-digest, + [AS_HELP_STRING(--enable-auth-digest=DIGEST,[ + Select the hmac algorithm to use (default "sha512"). Must be one of + "sha512", "sha256", "whirlpool".])], + if test "x$enableval" = xwhirlpool; then AUTH=whirlpool; fi + if test "x$enableval" = xsha512 ; then AUTH=sha512 ; fi + if test "x$enableval" = xsha256 ; then AUTH=sha256 ; fi ) -AC_DEFINE_UNQUOTED(ENABLE_DIGEST, EVP_${DIGEST}, [Select the digest algorithm to use.]) +AC_DEFINE_UNQUOTED(ENABLE_AUTH, EVP_${AUTH}, [Select the auth digest algorithm to use.]) if $CXX -v --help 2>&1 | grep -q fno-rtti; then CXXFLAGS="$CXXFLAGS -fno-rtti" fi -if $CXX -v --help 2>&1 | grep -q fexceptions; then - CXXFLAGS="$CXXFLAGS -fno-exceptions" -fi +#if $CXX -v --help 2>&1 | grep -q fexceptions; then +# CXXFLAGS="$CXXFLAGS -fno-exceptions" +#fi + +LIBS="$EXTRA_LIBS $LIBS" dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then dnl CXXFLAGS="$CXXFLAGS -ffunction-sections" @@ -343,47 +425,44 @@ dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections" dnl fi -AC_CONFIG_COMMANDS_POST([ +AC_SUBST(INCLUDES) + +AC_CONFIG_FILES([Makefile po/Makefile.in +src/Makefile +doc/Makefile +lib/Makefile +m4/Makefile +]) +AC_OUTPUT echo echo "***" echo "*** Configuration Summary" echo "***" echo "*** Kernel Iface: $IFTYPE/$IFSUBTYPE" +echo "*** RSA size: $RSA" echo "*** Cipher used: $CIPHER" echo "*** Digest used: $DIGEST" +echo "*** Authdigest: $AUTH" echo "*** HMAC length: $HMAC" echo "*** RAND used: $RAND" echo "*** Max. MTU: $MTU" -echo "*** Compression: $COMPRESS" -if test "x$DIGEST" = xmd4; then echo "***" -echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure" -fi +echo "*** Enable options:" +grep ENABLE_ config.h | sed -e 's/^/*** /' -if test "$HMAC" -lt 12; then +if test "$HMACSIZE" -lt 12; then echo "***" -echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure" +echo "*** WARNING: The hmac length you have chosen ($HMACSIZE) is quite insecure" fi -if test "$RAND" -lt 8; then +if test "$RANDSIZE" -lt 12; then echo "***" -echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure" +echo "*** WARNING: The random prefix you have chosen ($RANDSIZE) is probably insecure" fi echo "***" - echo -]) - -AC_SUBST(INCLUDES) -AC_CONFIG_FILES([Makefile po/Makefile.in -src/Makefile -doc/Makefile -lib/Makefile -m4/Makefile -]) -AC_OUTPUT