0
0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 12:02:28 +02:00
Commit Graph

306 Commits

Author SHA1 Message Date
james
e5d281cf2f Fixed bug with tls-auth and key-direction parameter
which was introduced in r844.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@865 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-29 07:47:47 +00:00
james
cbc0dada77 svn merge -r 854:863 $SO/trunk/openvpn
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@864 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-29 02:13:30 +00:00
james
d92819fa1a Added OPENVPN_PLUGIN_TLS_FINAL plugin callback.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@862 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-28 06:58:19 +00:00
james
1147885939 Minor ChangeLog edit.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@861 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-23 17:34:46 +00:00
james
51b1d4c2b0 Some PKCS11-related code wasn't properly #ifdefed.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@860 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-23 17:29:22 +00:00
james
33e81c4841 Man page and usage message changes to reflect
--ip-win32 adaptive and --route-method adaptive.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@859 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-22 19:50:48 +00:00
james
6215931bff Added new option --route-method adaptive (Win32)
which tries IP helper API first, then falls back to
route.exe.
Made --route-method adaptive the default.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@858 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-22 18:55:49 +00:00
james
a9c802b2a3 --ip-win32 adaptive is now the default.
--ip-win32 netsh (or --ip-win32 adaptive when in netsh
mode) can now set DNS/WINS addresses on the TAP-Win32
adapter.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@857 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-22 18:09:40 +00:00
james
a67724cb6d Fixed bug in automatic Win32 PATH setting code.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@856 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-17 22:23:28 +00:00
james
92bbb061ac svn merge -r 845:854 $SO/trunk/openvpn .
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@855 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-14 01:09:11 +00:00
james
6d89ede657 Don't warn user if he uses user/group/chroot and
did not specify persist-key but uses PKCS#11.

svn merge -r 847:848 https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn .


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@853 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-13 19:41:07 +00:00
james
f214bb2115 Added --auto-proxy directive to auto-detect HTTP or SOCKS
proxy settings (currently Windows only).


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@850 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-12 19:46:10 +00:00
james
df5722cc68 First attempt at automatic proxy detection,
Windows-only at this point.  Proxy settings
are taken from IE.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@846 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-08 23:10:22 +00:00
james
c959fc742e Inline file capability now works for
--secret and --tls-auth.  For example:

<secret>
[ascii key data]
</secret>


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@844 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-08 18:29:38 +00:00
james
e1447acc97 Fixed some gcc 4 warnings in misc.c.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@843 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-08 15:36:27 +00:00
james
bed73623cd Fixed segfault that occurred if remote_cert_eku is undefined and no
server certificate verification method was enabled.
Don't declare pkcs11 variables in struct options unless pkcs11
support is enabled.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@833 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-05 04:00:00 +00:00
james
6d5d1010bc Patch to support --topology subnet on Mac OS X (Mathias Sundman).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@832 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-12-05 01:21:49 +00:00
james
5acb3a79ae svn merge -r 780:820 $SO/trunk/openvpn .
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@828 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-28 05:50:52 +00:00
james
027a87ceed svn merge -r 823:825 $SO/contrib/alon/BETA21/openvpn .
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@827 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-28 05:09:54 +00:00
james
a17f69699e Modified nonblocking connect code so that this works as it should:
./openvpn --dev tap --proto tcp-client --verb 4 --remote [Black-Hole-IP-Addr] --connect-retry-max 1 --remap-usr1 SIGTERM


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@826 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-28 04:59:19 +00:00
james
1ae9d05173 Added --connect-timeout option to control the timeout
on TCP client connection attempts (doesn't work on all
OSes).  This patch also makes OpenVPN signalable during
TCP connection attempts.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@823 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-25 00:05:56 +00:00
james
d5badcf116 --remap-usr1 will now also remap signals thrown during initialization.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@822 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-24 18:44:57 +00:00
james
0f4ab65425 Fixed minor man page formatting issue.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@821 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-24 18:25:38 +00:00
james
a89295751f Merged PKCS11 changes from Alon:
svn merge -r 813:814 $SO/contrib/alon/BETA21/openvpn .


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@816 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-19 01:48:58 +00:00
james
b5e8bfc551 Version 2.1_beta7 released
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@806 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-13 01:35:45 +00:00
james
d31f9fd263 For Windows, set ip-win32 default back to dynamic.
To use new adaptive mode, set explicitly.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@805 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-12 23:11:18 +00:00
james
e78206c0c1 PKCS#11 fixes to interact with new backtrack-hardened
openvpn_time function.
svn merge -r 802:803 $SO/contrib/alon/BETA21/openvpn .


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@804 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-12 23:06:53 +00:00
james
0475d17e1c Reduce sensitivity to system clock instability
and backtracks.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@799 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-12 10:59:41 +00:00
james
f19f12c8b9 Fixed minor typos in --remote-cert-* documentation.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@798 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-12 08:36:00 +00:00
james
411e89ae6f Merged --remote-cert-ku, --remote-cert-eku, and
--remote-cert-tls from Alon's branch:
svn merge -r 793:796 $SO/contrib/alon/BETA21/openvpn .


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@797 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-12 08:26:57 +00:00
james
9423103dab Backed out change to update_time to handle time
backtracks.  Will reimplement as a more comprehensive
patch.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@790 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-09 21:13:57 +00:00
james
ba2ebecbed Fixed update_time to use a better algorithm for
preventing time backtracks even if the system
clock backtracks.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@789 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-09 10:03:50 +00:00
james
c18548e37e updated version number to 2.1_beta7
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@787 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-09 08:39:50 +00:00
james
b540a9e075 Merged (with some changes) Alon's
connect-retry-max option from
/contrib/alon/BETA21@783.

Added uninit_management_callback call to
init_instance_handle_signals so that
signals thrown during initialization can
bring us back to a management hold.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@786 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-09 08:36:26 +00:00
james
eadf16a660 Removed annoying 'i' variable from add_option.
Allow plugin and push directives to have multiple
parameters specified instead of only 1 quoted
parameter.

Allow plugin and push directives to have multi-line
parameter lists, such as:

<plugin>
  my-plugin.so
  parm1
  parm2
</plugin>


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@785 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-09 07:30:14 +00:00
james
d40f2b204b Added ENABLE_INLINE_FILES feature.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@784 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-08 12:50:11 +00:00
james
06d92b2941 Merged /contrib/alon/BETA21@778
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@782 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-05 07:48:05 +00:00
james
e8c1720d84 svn merge -r 771:780 $SO/trunk/openvpn
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@781 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-05 07:42:33 +00:00
james
d19b079b40 Allow blank passwords to be passed via the management interface.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@773 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-04 02:37:39 +00:00
james
e57abefbbc svn merge -r 770:771 $SO/trunk/openvpn
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@772 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-04 00:05:02 +00:00
james
e1231bd0e7 Changelog note about Windows build
being linked with LZO2.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@769 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-03 06:49:21 +00:00
james
9bfae3633b Documented --ip-win32 adaptive.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@768 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-03 02:46:31 +00:00
james
a4d621ec2e Documented --route-nopull.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@767 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-03 01:57:37 +00:00
james
03653f422f svn merge -r 760:764 $SO/trunk/openvpn
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@766 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-03 01:43:43 +00:00
james
a71fd52195 ChangeLog edit
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@762 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-02 19:44:41 +00:00
james
24a824b791 Edited prebuild to properly get the easy-rsa/1.0
version of openssl.cnf for the Windows installer.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@761 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-02 19:42:51 +00:00
james
8810c26cc5 Moved easy-rsa 2.0 scripts to easy-rsa/2.0 to
be compatible with 2.0.x distribution.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@757 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-02 18:09:01 +00:00
james
0b020506c4 VERSION 2.1_beta6
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@755 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-02 04:14:44 +00:00
james
b585364aed More PKCS#11 changes.
Merged with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@752


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@753 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-01 22:42:58 +00:00
james
76a59eae43 Merged 2.0.4 changes.
svn merge -r 737:749 $SO/trunk/openvpn


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@750 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-11-01 21:05:04 +00:00