]> git.ipfire.org Git - thirdparty/openvpn.git/log
thirdparty/openvpn.git
13 years agoRefactored get_highest_preference_tls_cipher
Adriaan de Jong [Mon, 27 Jun 2011 07:52:59 +0000 (09:52 +0200)] 
Refactored get_highest_preference_tls_cipher

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored tls_show_available_ciphers
Adriaan de Jong [Mon, 27 Jun 2011 07:44:47 +0000 (09:44 +0200)] 
Refactored tls_show_available_ciphers

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored TLS_PRF to new hmac and md primitives
Adriaan de Jong [Mon, 27 Jun 2011 07:22:08 +0000 (09:22 +0200)] 
Refactored TLS_PRF to new hmac and md primitives

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored SSL initialisation functions
Adriaan de Jong [Wed, 29 Jun 2011 13:15:32 +0000 (15:15 +0200)] 
Refactored SSL initialisation functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored: Added stubs for new files
Adriaan de Jong [Fri, 24 Jun 2011 13:05:28 +0000 (15:05 +0200)] 
Refactored: Added stubs for new files

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoAdded a check for Openssl or PolarSSL defines
Adriaan de Jong [Thu, 23 Jun 2011 16:02:45 +0000 (18:02 +0200)] 
Added a check for Openssl or PolarSSL defines

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRemoved stale OpenSSL defines from crypto.h
Adriaan de Jong [Thu, 23 Jun 2011 15:54:49 +0000 (17:54 +0200)] 
Removed stale OpenSSL defines from crypto.h

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored: Moved crypto.h inline functions to end of file
Adriaan de Jong [Thu, 23 Jun 2011 15:52:47 +0000 (17:52 +0200)] 
Refactored: Moved crypto.h inline functions to end of file

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoAdded PRNG doxygen
Adriaan de Jong [Thu, 23 Jun 2011 15:44:35 +0000 (17:44 +0200)] 
Added PRNG doxygen

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored cipher functions
Adriaan de Jong [Thu, 23 Jun 2011 15:39:42 +0000 (17:39 +0200)] 
Refactored cipher functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored cipher key types
Adriaan de Jong [Thu, 23 Jun 2011 15:31:19 +0000 (17:31 +0200)] 
Refactored cipher key types

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored HMAC functions
Adriaan de Jong [Thu, 23 Jun 2011 15:18:32 +0000 (17:18 +0200)] 
Refactored HMAC functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored message digest functions
Adriaan de Jong [Thu, 23 Jun 2011 14:56:29 +0000 (16:56 +0200)] 
Refactored message digest functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored message digest type functions
Adriaan de Jong [Thu, 23 Jun 2011 14:21:32 +0000 (16:21 +0200)] 
Refactored message digest type functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored NTLM DES key generation
Adriaan de Jong [Thu, 23 Jun 2011 13:03:09 +0000 (15:03 +0200)] 
Refactored NTLM DES key generation

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored DES key manipulation functions
Adriaan de Jong [Thu, 23 Jun 2011 10:45:29 +0000 (12:45 +0200)] 
Refactored DES key manipulation functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored crypto initialisation functions
Adriaan de Jong [Thu, 23 Jun 2011 09:40:52 +0000 (11:40 +0200)] 
Refactored crypto initialisation functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored SSL_clear_error()
Adriaan de Jong [Thu, 23 Jun 2011 09:07:12 +0000 (11:07 +0200)] 
Refactored SSL_clear_error()

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored show_available_* functions
Adriaan de Jong [Thu, 23 Jun 2011 08:18:36 +0000 (10:18 +0200)] 
Refactored show_available_* functions

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored maximum cipher and hmac length constants
Adriaan de Jong [Thu, 23 Jun 2011 07:41:28 +0000 (09:41 +0200)] 
Refactored maximum cipher and hmac length constants

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored OpenSSL-specific constants
Adriaan de Jong [Thu, 23 Jun 2011 07:05:12 +0000 (09:05 +0200)] 
Refactored OpenSSL-specific constants

[David S: Fixed a few whitespace errors before merging]

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoRefactored to rand_bytes for OpenSSL-independency
Adriaan de Jong [Wed, 22 Jun 2011 15:16:03 +0000 (17:16 +0200)] 
Refactored to rand_bytes for OpenSSL-independency

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoChanged configure to accept --with-ssl-type=openssl
Adriaan de Jong [Fri, 24 Jun 2011 06:37:33 +0000 (08:37 +0200)] 
Changed configure to accept --with-ssl-type=openssl

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoMove block for "stale-routes-check" config inside #ifdef P2MP_SERVER block
Gert Doering [Sat, 8 Oct 2011 10:26:52 +0000 (12:26 +0200)] 
Move block for "stale-routes-check" config inside #ifdef P2MP_SERVER block

options->stale_routes_ageing_time etc.  are not defined otherwise, and
compilation fails.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Davide Guerri <d.guerri@caspur.it>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
13 years agoNew feauture: Add --stale-routes-check
Davide Guerri [Thu, 15 Sep 2011 21:42:22 +0000 (23:42 +0200)] 
New feauture: Add --stale-routes-check

This patch adds a stale-routes-check option that takes 2 parameters: a ageing
time (in seconds) and a check interval (in seconds). The latter defaults to the
former if it's not present.  Internally, a new "check" is added in
multi_process_per_second_timers_dowork(). This check deletes stale routes and
it is inspired to the function multi_reap_range().

We're running a very large connectivity infrastructure based on openVPN (more
than 4000 different clients connected per day per server), so we can throughly
check this patch (or, of course, any variant of it).

Signed-off-by: Davide Guerri <d.guerri@caspur.it>
Reviewed-by: David Sommerseth <davids@redhat.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoPlatform cleanup for NetBSD
Gert Doering [Fri, 16 Sep 2011 17:51:09 +0000 (19:51 +0200)] 
Platform cleanup for NetBSD

make TAP devices work (need to go via multiplex device /dev/tap)
cleanup TUN devices at program end ("ifconfig tunX destroy")
correctly setup TUN devices for "topology subnet"
don't try to put TAP devices into TUNSIFHEAD mode (get rid of error message)

Tested on NetBSD 5.1_STABLE / Sparc64

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agofix ipv6 compilation under macosx >= 1070 - v3
JuanJo Ciarlante [Mon, 19 Sep 2011 14:07:14 +0000 (16:07 +0200)] 
fix ipv6 compilation under macosx >= 1070 - v3

 - use __APPLE_USE_RFC_3542 for macosx build environment >= 1070
 - define SOL_IP from IPPROTO_IP if it's missing
   In Linux man 7 ip says:
   "Using SOL_IP socket options level isn't portable, BSD-based
   stacks use IPPROTO_IP level."

Signed-off-by: JuanJo Ciarlante <jjo+ml@google.com>
Tested-by: Eric F Crist <ecrist@secure-computing.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFixed compile issues on FreeBSD and Solaris
David Sommerseth [Mon, 19 Sep 2011 14:43:04 +0000 (16:43 +0200)] 
Fixed compile issues on FreeBSD and Solaris

In commit 7fb0e07ec3f7c5f6514523085dbe struct route changed and
this change was not fixed in all places in tun.c, which caused
a compilation error.  A few whitespace fixes is added as well.

OSX needs to be fixed as well, but this will be done in a separate patch.

Tested-by: Eric F Crist <ecrist@secure-computing.net> (FreeBSD)
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFixed management interface bug where >FATAL notifications were
James Yonan [Fri, 2 Sep 2011 23:49:45 +0000 (23:49 +0000)] 
Fixed management interface bug where >FATAL notifications were
not being output properly because the management interface
socket was being closed before the >FATAL notification could
be transmitted.

Version 2.1.14

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7587 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoMinor fix to CC_PRINT char class -- treat DEL (ascii 127)
James Yonan [Fri, 26 Aug 2011 00:43:45 +0000 (00:43 +0000)] 
Minor fix to CC_PRINT char class -- treat DEL (ascii 127)
as a control char.

Version 2.1.13.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7581 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoadd --mark option to set SO_MARK sockopt
Heiko Hund [Wed, 31 Aug 2011 18:05:15 +0000 (20:05 +0200)] 
add --mark option to set SO_MARK sockopt

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agodefine IN6_ARE_ADDR_EQUAL macro for WIN32
Heiko Hund [Wed, 31 Aug 2011 14:49:22 +0000 (14:49 +0000)] 
define IN6_ARE_ADDR_EQUAL macro for WIN32

Windows headers do not define the IN6_ARE_ADDR_EQUAL macro. It needs
to be defined locally when building for WIN32.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agolowercase include header name in syshead.h
Heiko Hund [Wed, 31 Aug 2011 14:38:08 +0000 (14:38 +0000)] 
lowercase include header name in syshead.h

Cross compiling for Windows is broken since commit
739fa9881f12e67dc8b9cadc7230e59e7fe42423 added the mixed
case header name "NtDDNdis.h" to the file. While this header
exists in a MinGW build environment it's lowercase there.

Windows doesn't mind the case of a file name, but Linux does.
So, lowercasing the filename will make openvpn build in both
worlds.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFixed a typo in win32.h that prevented building with Visual Studio
Samuli Seppänen [Thu, 14 Jul 2011 00:12:29 +0000 (17:12 -0700)] 
Fixed a typo in win32.h that prevented building with Visual Studio

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoAdditional Visual Studio 2008 build fixes to tun.c
Samuli Seppänen [Thu, 14 Jul 2011 00:12:28 +0000 (17:12 -0700)] 
Additional Visual Studio 2008 build fixes to tun.c

Tested-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoUSE_PF_INET6 by default for v2.3
JuanJo Ciarlante [Thu, 26 May 2011 17:01:42 +0000 (19:01 +0200)] 
USE_PF_INET6 by default for v2.3

- put all #ifdef'd code in place, kill the cpp symbol,
- thus in v2.3 it's not actually possible to --disable-ipv6 :)

RATIONALE:
 #1 some wacky compilers choke on #ifdef'd constructions for
    concatenated strings, and given that:
 #2 v2.3 has already transport ipv6 by default
=> doesn't justify putting effort on #1 to keep USE_PF_INET6
   ifdef wraps.

Signed-off-by: JuanJo Ciarlante <jjo+ml@google.com>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoReplace 32-bit-based add_in6_addr() implementation by an 8-bit based one
Gert Doering [Sat, 28 May 2011 20:50:40 +0000 (22:50 +0200)] 
Replace 32-bit-based add_in6_addr() implementation by an 8-bit based one

Windows has no 32-bit accessor to the union inside "struct in6_addr",
and the 8-bit accessor is the only common denominator across BSD, Solaris,
Linux and Windows...

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFix a Visual Studio 2008 build issue in socket.c
Samuli Seppänen [Tue, 31 May 2011 13:17:40 +0000 (16:17 +0300)] 
Fix a Visual Studio 2008 build issue in socket.c

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFix a Visual Studio 2008 build error in options.c
Samuli Seppanen [Thu, 26 May 2011 13:23:05 +0000 (16:23 +0300)] 
Fix a Visual Studio 2008 build error in options.c

Partially fixes Trac ticket #137

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFix a Visual Studio 2008 build error in tun.c
Samuli Seppanen [Thu, 26 May 2011 13:23:04 +0000 (16:23 +0300)] 
Fix a Visual Studio 2008 build error in tun.c

Partially fixes ticket #137

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFix Microsoft Visual Studio incompatibility in plugin.c
David Sommerseth [Thu, 26 May 2011 13:23:03 +0000 (16:23 +0300)] 
Fix Microsoft Visual Studio incompatibility in plugin.c

MS Visual Studio don't like to have struct members named in the
variable declaration.  Without this fix, Visual Studio is not able
to compile the new v3 plug-in API.

Signed-off-by: David Sommerseth <davids@redhat.com>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
13 years agoFixed a number of fatal build errors on Visual Studio 2008
Samuli Seppänen [Thu, 26 May 2011 13:23:02 +0000 (16:23 +0300)] 
Fixed a number of fatal build errors on Visual Studio 2008

Partially fixes ticket #137

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoSkip rather than fail test in addressless FreeBSD jails.
Matthias Andree [Wed, 20 Jul 2011 20:56:20 +0000 (22:56 +0200)] 
Skip rather than fail test in addressless FreeBSD jails.

Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoremove legacy code to query IE proxy information
Heiko Hund [Thu, 11 Aug 2011 15:19:46 +0000 (15:19 +0000)] 
remove legacy code to query IE proxy information

The code in ieproxy.[ch] is not used anywhere in OpenVPN anymore.
So, there's no need to keep it.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoMerged TODO.IPv6 with TODO.ipv6 and README.IPv6 with README.ipv6
Samuli Seppänen [Thu, 11 Aug 2011 16:00:57 +0000 (19:00 +0300)] 
Merged TODO.IPv6 with TODO.ipv6 and README.IPv6 with README.ipv6

Prior to this patch were two sets of IPv6 README/TODO files: one from payload
and one from transport patchset. Unfortunately Git on Windows gets very confused
of these files, as they only differ in case. This patch merges these sets into
one.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoremove function is_proto_tcp()
Heiko Hund [Thu, 18 Aug 2011 10:16:21 +0000 (10:16 +0000)] 
remove function is_proto_tcp()

The implementation of is_proto_tcp() was invalid since the IPv6 stuff got
merged into master. There's proto_is_tcp() that does the same job right.

Remove is_proto_tcp() and make its only caller use proto_is_tcp() instead.

Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-By: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoadd .gitignore to official repository
Heiko Hund [Thu, 18 Aug 2011 12:17:50 +0000 (12:17 +0000)] 
add .gitignore to official repository

This .gitignore make the output of git status a lot more readable. It was
made from the dynamically generated files that showed after using both
build system.

Signed-off-by: Samuli Seppänen <samuli@openvpn.ne>
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-By: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoFor all accesses to "struct route_list * rl", check first that rl is non-NULL
Gert Doering [Tue, 16 Aug 2011 18:05:13 +0000 (20:05 +0200)] 
For all accesses to "struct route_list * rl", check first that rl is non-NULL

In IPv4-only mode, this cannot happen, but if IPv6 is enabled
and a servers pushes IPv6 routes and no IPv4 routes -> crash boom.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-By: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
13 years ago"status" management interface command (version >= 2) will now
James Yonan [Fri, 19 Aug 2011 03:15:25 +0000 (03:15 +0000)] 
"status" management interface command (version >= 2) will now
include the username for each connected user.  This should
generally be backward compatible with existing management
interface clients since the new username field is added
to the CLIENT_LIST header as well.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7539 e7ae566f-a301-0410-adde-c780ea21d3b5

Conflicts:
multi.c - hash_iterator_init() takes only 2 arguments now.

Signed-off-by: David Sommerseth <davids@redhat.com>
13 years agoCC_PRINT character class now allows any 8-bit character value >= 32.
James Yonan [Fri, 19 Aug 2011 03:10:08 +0000 (03:10 +0000)] 
CC_PRINT character class now allows any 8-bit character value >= 32.
This is done to allow UTF-8 and restrict the use of control characters
in usernames, passwords, common names, etc.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7538 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoFixed issue where redirect-gateway block-local code was not
James Yonan [Fri, 19 Aug 2011 03:07:27 +0000 (03:07 +0000)] 
Fixed issue where redirect-gateway block-local code was not
correctly calculating the two halves of the subnet if the
gateway was in the upper half (Gert Doering).

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7537 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoIncreased the --verb threshold for "PID_ERR replay" messages
James Yonan [Thu, 11 Aug 2011 07:03:39 +0000 (07:03 +0000)] 
Increased the --verb threshold for "PID_ERR replay" messages
to 4 from 3.

Version 2.1.10

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7522 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoChanged CC_PRINT character class to allow UTF-8 chars.
James Yonan [Sat, 6 Aug 2011 20:06:31 +0000 (20:06 +0000)] 
Changed CC_PRINT character class to allow UTF-8 chars.
This allows usernames, common names, etc. to be UTF-8.

Version 2.1.9

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7518 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoModified sanitize_control_message to remove redacted data from
James Yonan [Thu, 28 Jul 2011 06:01:23 +0000 (06:01 +0000)] 
Modified sanitize_control_message to remove redacted data from
control string rather than blotting it out with "_" chars.

Version 2.1.8

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7482 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoRedact "echo" directive strings from log, since
James Yonan [Thu, 28 Jul 2011 01:29:12 +0000 (01:29 +0000)] 
Redact "echo" directive strings from log, since
these strings (going forward) could conceivably
contain security-sensitive data.

Version 2.1.7

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7480 e7ae566f-a301-0410-adde-c780ea21d3b5

13 years agoMerge branch 'svn-merger'
David Sommerseth [Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)] 
Merge branch 'svn-merger'

13 years agoMerge remote branch SVN 2.1 into the git tree
David Sommerseth [Sun, 24 Jul 2011 23:44:27 +0000 (01:44 +0200)] 
Merge remote branch SVN 2.1 into the git tree

Hopefully the last SVN merge we need to do, as these merges are getting
more and more difficult.  Most of the files had minor changes, but due to
the CRLF unification patch (commit 6b2883a637fe73492) we got an increased
number of conflicts.  In addition inclusion of IPv6 support makes the
creates a lot of merge issues in route.c and socket.c

This merge also reverts commit 7c18c6353904f8c6e7 which merged
add_bypass_address() into add_host_route_if_nonlocal().  However the SVN
tree began to use add_bypass_address() another place, where at first glance
it did not be appropriate to use add_host_route_if_nonlocal().

This merge has gone through a 'make check' without any errors, but have
not been tested more thoroughly yet.

Conflicts:
ChangeLog
INSTALL
INSTALL-win32.txt
Makefile.am
acinclude.m4
base64.c
buffer.c
buffer.h
common.h
configure.ac
contrib/pull-resolv-conf/client.down
contrib/pull-resolv-conf/client.up
crypto.c
cryptoapi.c
easy-rsa/2.0/Makefile
easy-rsa/2.0/README
easy-rsa/2.0/build-ca
easy-rsa/2.0/build-dh
easy-rsa/2.0/build-inter
easy-rsa/2.0/build-key
easy-rsa/2.0/build-key-pass
easy-rsa/2.0/build-key-pkcs12
easy-rsa/2.0/build-key-server
easy-rsa/2.0/build-req
easy-rsa/2.0/build-req-pass
easy-rsa/2.0/clean-all
easy-rsa/2.0/inherit-inter
easy-rsa/2.0/list-crl
easy-rsa/2.0/pkitool
easy-rsa/2.0/revoke-full
easy-rsa/2.0/sign-req
easy-rsa/2.0/vars
easy-rsa/2.0/whichopensslcnf
easy-rsa/Windows/build-ca-pass.bat
easy-rsa/Windows/build-key-pass.bat
easy-rsa/Windows/build-key-server-pass.bat
easy-rsa/Windows/init-config.bat
easy-rsa/Windows/vars.bat.sample
error.c
error.h
forward.c
helper.c
httpdigest.c
httpdigest.h
ieproxy.c
init.c
init.h
install-win32/Makefile.am
install-win32/makeopenvpn
install-win32/openssl/openssl097.patch
install-win32/openssl/openssl098.patch
install-win32/openvpn.nsi
list.c
list.h
manage.c
manage.h
management/management-notes.txt
mbuf.c
mbuf.h
misc.c
misc.h
mroute.c
mroute.h
msvc/autodefs.h.in
msvc/config.py
msvc/msvc.mak
mtcp.c
mudp.c
multi.c
multi.h
occ.c
openvpn-plugin.h
openvpn.8
openvpn.h
options.c
options.h
otime.c
otime.h
perf.c
pf.c
ping.c
pkcs11.c
plugin.c
plugin.h
plugin/auth-pam/README
plugin/auth-pam/auth-pam.c
pool.c
pool.h
proto.h
proxy.c
ps.c
push.c
reliable.c
route.c
route.h
sample-config-files/firewall.sh
sample-scripts/bridge-start
sample-scripts/bridge-stop
sample-scripts/openvpn.init
sample-scripts/verify-cn
schedule.c
schedule.h
service-win32/openvpnserv.c
sig.c
socket.c
socket.h
socks.c
socks.h
ssl.c
ssl.h
status.c
syshead.h
tap-win32/SOURCES.in
tap-win32/common.h
tap-win32/proto.h
tap-win32/tapdrvr.c
tap-win32/types.h
tun.c
tun.h
version.m4
win/autodefs.h.in
win/build.py
win/build_all.py
win/build_ddk.py
win/build_exe.py
win/config.py
win/config_all.py
win/config_tap.py
win/config_ti.py
win/js.py
win/make_dist.py
win/msvc.mak.in
win/settings.in
win/show.py
win/sign.py
win/tap_span.py
win/wb.py
win32.c
win32.h

Signed-off-by: David Sommerseth <davids@redhat.com>
Reviewed-by: Gert Doering <gert@greenie.muc.de>
Reviewed-by: James Yonan <james@openvpn.net>
Reviewed-by: Adriaan de Jong <dejong@fox-it.com>
14 years agoMoved doxygen-specific files to a separate directory
David Sommerseth [Thu, 28 Jul 2011 21:58:50 +0000 (23:58 +0200)] 
Moved doxygen-specific files to a separate directory

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded main/control docs
David Sommerseth [Thu, 28 Jul 2011 21:56:24 +0000 (23:56 +0200)] 
Added main/control docs

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded data channel fragmentation docs
David Sommerseth [Thu, 28 Jul 2011 21:27:58 +0000 (23:27 +0200)] 
Added data channel fragmentation docs

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded memory management documentation
David Sommerseth [Thu, 28 Jul 2011 21:25:07 +0000 (23:25 +0200)] 
Added memory management documentation

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded reliability layer documentation
David Sommerseth [Thu, 28 Jul 2011 21:22:51 +0000 (23:22 +0200)] 
Added reliability layer documentation

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded compression docs
David Sommerseth [Thu, 28 Jul 2011 21:17:51 +0000 (23:17 +0200)] 
Added compression docs

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded control channel crypto docs
David Sommerseth [Thu, 28 Jul 2011 21:08:17 +0000 (23:08 +0200)] 
Added control channel crypto docs

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoDoxygen: Added data channel crypto docs
David Sommerseth [Thu, 28 Jul 2011 21:05:07 +0000 (23:05 +0200)] 
Doxygen: Added data channel crypto docs

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoAdded Doxygen doxyfile
Adriaan de Jong [Tue, 21 Jun 2011 08:05:04 +0000 (10:05 +0200)] 
Added Doxygen doxyfile

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoFixed MSVC compile error related to r7408.
James Yonan [Wed, 6 Jul 2011 05:51:19 +0000 (05:51 +0000)] 
Fixed MSVC compile error related to r7408.

Version 2.1.6.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7419 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoVersion 2.1.5.
James Yonan [Tue, 5 Jul 2011 00:46:40 +0000 (00:46 +0000)] 
Version 2.1.5.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7412 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoAdded "management-query-remote" directive (client) to allow
James Yonan [Tue, 5 Jul 2011 00:33:55 +0000 (00:33 +0000)] 
Added "management-query-remote" directive (client) to allow
the management interface to override the "remote" directive.

See "remote" command in management/management-notes.txt for
documentation.

Version 2.1.4.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7410 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoExtended x509-track to allow SHA1 certificate hash to be extracted,
James Yonan [Mon, 4 Jul 2011 08:43:51 +0000 (08:43 +0000)] 
Extended x509-track to allow SHA1 certificate hash to be extracted,
e.g.:

  x509-track "+SHA1"

will extract the SHA1 certificate hash for all certs in the
client chain.

Version 2.1.3z

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7408 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoFixes to easy-rsa/2.0
Samuli Seppänen [Thu, 30 Jun 2011 07:59:10 +0000 (10:59 +0300)] 
Fixes to easy-rsa/2.0

As support for OpenSSL 1.0.0 requires a modified openssl.cnf file, it was
decided to rename openssl.cnf to openssl-1.0.0.cnf for clarity and better
support of different OpenSSL versions. The old openssl.cnf was renamed as
openssl-0.9.8.cnf.

This patch makes sure that all openssl*.cnf files are copied when running 'make
install' in easy-rsa and makes the whichopensslcnf script aware of them as well.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoMade domake-win builds to use easy-rsa/2.0/openssl-1.0.0.cnf
Samuli Seppänen [Wed, 29 Jun 2011 08:24:08 +0000 (11:24 +0300)] 
Made domake-win builds to use easy-rsa/2.0/openssl-1.0.0.cnf

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoUpdated "easy-rsa" for OpenSSL 1.0.0
Samuli Seppänen [Wed, 29 Jun 2011 08:24:07 +0000 (11:24 +0300)] 
Updated "easy-rsa" for OpenSSL 1.0.0

This patch fixes remaining issues with Trac ticket #125. It does the following:

- Update easy-rsa/2.0/README
- Rename easy-rsa/2.0/openssl.cnf as openssl-0.9.8.cnf
- Add easy-rsa/2.0/openssl-1.0.0.cnf
- Updated vars.bat.sample to use openssl-1.0.0.cnf
- Updated win/openvpn.nsi to use openssl-1.0.0.cnf
- Add a few undefined variables to vars and vars.bat.sample:
  required by OpenSSL 1.0.0 (at least on Windows)

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoRevert "Add new openssl.cnf to easy-rsa/Windows"
David Sommerseth [Mon, 20 Jun 2011 09:47:14 +0000 (11:47 +0200)] 
Revert "Add new openssl.cnf to easy-rsa/Windows"

This reverts commit 663860ad04dd4190fddbee63e724d3fdceafd937.

Accoding to Jan Just Keijser [1] there are issues with this new
openssl.cnf file, so reverting this commit and wait for a new patch.

[1] http://thread.gmane.org/gmane.network.openvpn.devel/4729/focus=4735

14 years agoAdd new openssl.cnf to easy-rsa/Windows
Samuli Seppänen [Mon, 20 Jun 2011 07:49:41 +0000 (10:49 +0300)] 
Add new openssl.cnf to easy-rsa/Windows

This is required for patch "Fix a build-ca issue on Windows" to work

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
14 years agoFix a build-ca issue on Windows
Samuli Seppänen [Fri, 17 Jun 2011 09:18:02 +0000 (12:18 +0300)] 
Fix a build-ca issue on Windows

Fixes Trac ticket #125

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoRemove support for Linux 2.2 configuration fallback
David Sommerseth [Fri, 3 Jun 2011 11:53:45 +0000 (13:53 +0200)] 
Remove support for Linux 2.2 configuration fallback

When configuring OpenVPN nowadays, the TUN/TAP configuration can
sometimes jump into the Linux 2.2 fallback code paths, which will
also fails.  The reason it jumps into fallback mode is that the
tun/tap device already exists or that /dev/net/tun does not exist.
This can be very confusing, as /dev/tunX which the fallback mode tries
to use, does not exist on Linux 2.4 and newer.

Considering that the last Linux 2.2 update was released 25-Feb-2004
and the first Linux 2.4 release came 04-Jan-2001, there are no
reasonable reasons to help users to stay on outdated kernels.
I consider this extra code path just waste of bytes ... so lets make
the world simpler.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
14 years agoDocumented --x509-username-field option
Robert Fischer [Thu, 21 Apr 2011 20:55:52 +0000 (22:55 +0200)] 
Documented --x509-username-field option

Also fixed a typo in the --help screen.

Signed-off-by: Robert Fischer <ml-openvpn@trispace.org>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoAdded info about --show-proxy-settings
Robert Fischer [Thu, 21 Apr 2011 19:36:10 +0000 (21:36 +0200)] 
Added info about --show-proxy-settings

Signed-off-by: Robert Fischer <ml-openvpn@trispace.org>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoAdded redirect-gateway block-local flag, with support for
James Yonan [Sun, 12 Jun 2011 01:14:36 +0000 (01:14 +0000)] 
Added redirect-gateway block-local flag, with support for
Linux, Mac OS X, and Linux.  This flag (which is pushable
from server) blocks client access to local LAN while VPN
session is active.

Added standalone --show-gateway option to show info about
default gateway.

Extensively refactored get_default_gateway function in
route.c to ease implementation of block-local.

Removed "Experimental" disclaimer from redirect-gateway
man page.

Version 2.1.3y.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7334 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agor7316 fixes.
James Yonan [Fri, 10 Jun 2011 19:01:35 +0000 (19:01 +0000)] 
r7316 fixes.

Version 2.1.3x1.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7332 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoAdded support for static challenge/response protocol.
James Yonan [Fri, 3 Jun 2011 21:21:20 +0000 (21:21 +0000)] 
Added support for static challenge/response protocol.
This includes the new "static-challenge" directive.

See management/management-notes.txt for details on both
static and dynamic challenge/response protocols.

All client-side challenge/response code is #ifdefed on
ENABLE_CLIENT_CR and can be removed from the build
by commenting out the definition of ENABLE_CLIENT_CR
in syshead.h.

Version 2.1.3x.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7316 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoFix compiling issues with pkcs11 when --disable-management is configured
David Sommerseth [Tue, 31 May 2011 14:59:30 +0000 (16:59 +0200)] 
Fix compiling issues with pkcs11 when --disable-management is configured

pkcs11.c seems to miss some header files which gets implicitly added when
the management interface is enabled.

Signed-off-by: David Sommerseth <davids@redhat.com>
Tested-by: Mr Dash Four <mr.dash.four@googlemail.com>
14 years agoDon't define ENABLE_PUSH_PEER_INFO if SSL is not available
David Sommerseth [Thu, 26 May 2011 08:16:59 +0000 (10:16 +0200)] 
Don't define ENABLE_PUSH_PEER_INFO if SSL is not available

The push_peer_info feature depends on the SSL infrastructure and openvpn
will fail to build if ./configure --disable-crypto --disable-ssl is
used.  The solution is to not define ENABLE_PUSH_PEER_INFO if we don't
have crypto/ssl.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
14 years agoMerge remote-tracking branch 'cron2/feat_ipv6_payload_2.3'
David Sommerseth [Mon, 23 May 2011 10:16:49 +0000 (12:16 +0200)] 
Merge remote-tracking branch 'cron2/feat_ipv6_payload_2.3'

Conflicts:
options.c
- version string for IPv6 payload changed

Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoWindows IPv6 cleanup - properly remove IPv6 routes and interface config
Gert Doering [Sun, 22 May 2011 17:02:39 +0000 (19:02 +0200)] 
Windows IPv6 cleanup - properly remove IPv6 routes and interface config
after tunnel shutdown.  Needs to make delete_route_ipv6() visible from
tun.c (route.c, route.h) and to properly zero-out host bits from IPv6
"network" at interface route clearing.  Further, add IPv6 routes with
"store=active" to make sure nothing lingers after a system crash while
OpenVPN was running.

While at it, small Solaris cleanup - use CLEAR() to zero-out "ifr" struct.

Tested on Windows XP SP3 and Win7 by Gert Doering and Tony Lim.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
14 years agoFix const declarations in plug-in v3 structs
David Sommerseth [Fri, 29 Apr 2011 11:28:06 +0000 (13:28 +0200)] 
Fix const declarations in plug-in v3 structs

Microsoft Visual Studio complains about const char const **ptr declarations
and expects them to be be const char ** const ptr.  The latter is what was the
intention, that neither the pointer nor the value(s) it points at can be changed.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
14 years agoChange the netsh.exe command from "add" to "set".
smos [Tue, 10 May 2011 08:01:48 +0000 (10:01 +0200)] 
Change the netsh.exe command from "add" to "set".

This prevents the netsh.exe command from exiting with a status 1
when the address already exists. By adding store=active the address
will not survive a reboot and be assigned temporarily.

Tested on Windows 7 and Windows XP SP 2.

Signed-off-by: smos <seth.mos@dds.nl>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: Gert Doering <gert@greenie.muc.de>
14 years agoFix 2.2.0 build failure when management interface disabled
Matthew L. Creech [Wed, 11 May 2011 21:57:28 +0000 (17:57 -0400)] 
Fix 2.2.0 build failure when management interface disabled

I just upgraded to 2.2.0, and my build fails with:

ps.c: In function 'port_share_open':
ps.c:778:7: error: 'management' undeclared (first use in this function)
ps.c:778:7: note: each undeclared identifier is reported only once for
each function it appears in
make[5]: *** [ps.o] Error 1

[Comment by David Sommerseth:
 This happens only when building with --enable-small, --disable-management
 and --disable-pkcs11

 Also changed MANAGEMENT_ENABLED to ENABLE_MANAGEMENT from the original
 patch.
]

Mailing-list: http://thread.gmane.org/gmane.network.openvpn.devel/4639
Signed-off-by: Matthew L. Creech <mlcreech@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoFix issues with some older GCC compilers
Simon Matter [Tue, 8 Mar 2011 07:27:00 +0000 (07:27 +0000)] 
Fix issues with some older GCC compilers

Some older GCC compilers don't like that variables are declared
in the middle of the code, and expect them on the top in the
block/scope.

Trac-ticket: 99
Signed-off-by: Simon Matter <simon.matter@invoca.ch>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
14 years agoFix compile issues when using --enable-small and --disable-ssl/--disable-crypto
Gustavo Zacarias [Wed, 27 Apr 2011 16:43:50 +0000 (18:43 +0200)] 
Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto

The tmp_dir string is required in the options struct regardless of options
so spin it out of #if conditionals.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoSolved hidden merge conflicts between master and svn-branch-2.1
David Sommerseth [Tue, 26 Apr 2011 21:27:12 +0000 (23:27 +0200)] 
Solved hidden merge conflicts between master and svn-branch-2.1

ps.c - The feat_ipv6_transport patch set modifies struct openvpn_sockaddr by
       adding a union named 'addr' in commit 8335caf929f21b31.

ssl.c - A needed } and #endif had been dropped by a mistake

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoMerge branch 'svn-branch-2.1' into merge
David Sommerseth [Tue, 26 Apr 2011 21:04:18 +0000 (23:04 +0200)] 
Merge branch 'svn-branch-2.1' into merge

Pulling in changes from James' 2.1/openvpn branch in SVN.

Conflicts:
buffer.c
init.c
manage.h
multi.c
openvpn.8
options.c
ssl.c
version.m4
win/sign.py

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
14 years agoFixed compile issues on Windows.
James Yonan [Mon, 25 Apr 2011 06:21:57 +0000 (06:21 +0000)] 
Fixed compile issues on Windows.

Version 2.1.3w

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7219 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoAdded new "extra-certs" and "verify-hash" options (see man page for
James Yonan [Mon, 25 Apr 2011 04:58:34 +0000 (04:58 +0000)] 
Added new "extra-certs" and "verify-hash" options (see man page for
details).

Increase the timeout after SIGUSR1 restart when restart is not
due to server_poll_timeout.

Version 2.1.3v

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7215 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoAdded 'dir' flag to "crl-verify" (see man page for info).
James Yonan [Sun, 24 Apr 2011 00:59:28 +0000 (00:59 +0000)] 
Added 'dir' flag to "crl-verify" (see man page for info).

Don't call SSL_CTX_set_client_CA_list or SSL_CTX_set_client_CA_list
if not running in server mode (these functions are only useful for
TLS/SSL servers).

Modified openvpn_snprintf to return false on overflow, and true
otherwise.

When AUTH_FAILED,... is received, log the full string.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7213 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoRevert r7092 and r7151, i.e. remove --enable-osxipconfig
James Yonan [Tue, 19 Apr 2011 10:28:06 +0000 (10:28 +0000)] 
Revert r7092 and r7151, i.e. remove --enable-osxipconfig
configure option.  ipconfig on Mac has certain behavior that makes
it unsuitable for use by OpenVPN to configure tun/tap interface.

Version 2.1.3u

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7191 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoVersion 2.1.3t
James Yonan [Tue, 12 Apr 2011 05:15:15 +0000 (05:15 +0000)] 
Version 2.1.3t

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7152 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoFor Mac OSX, when DARWIN_USE_IPCONFIG is defined, retry ipconfig
James Yonan [Tue, 12 Apr 2011 05:14:34 +0000 (05:14 +0000)] 
For Mac OSX, when DARWIN_USE_IPCONFIG is defined, retry ipconfig
command on failure once every second for up to 15 seconds.  This
is necessary to work around an issue observed on OSX 10.5 where
the ipconfig command sometimes fails if executed immediately after
the tun device open.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7151 e7ae566f-a301-0410-adde-c780ea21d3b5

14 years agoFixed bug in port-share that could cause port share process to
James Yonan [Sun, 3 Apr 2011 21:48:15 +0000 (21:48 +0000)] 
Fixed bug in port-share that could cause port share process to
crash with output like this:

TCP connection established with 85.190.0.3:41781
85.190.0.3:41781 SIGTERM[soft,port-share-redirect] received, client-instance exiting
MANAGEMENT: TCP recv error: Socket operation on non-socket
MANAGEMENT: Client disconnected
MANAGEMENT: Triggering management exit
Exiting due to fatal error
EVENT: epoll_ctl EPOLL_CTL_MOD failed, sd=6: Bad file descriptor (errno=9)

Then an error like this for every incoming connection that should be
proxied:

76.120.71.74:55302 PORT SHARE: sendmsg failed -- unable to communicate with background process (6,8,-1,-1): Connection refused (errno=111)

Version 2.1.3s

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7127 e7ae566f-a301-0410-adde-c780ea21d3b5