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

75 Commits

Author SHA1 Message Date
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
james
1818cf94da VERSION 2.1_beta5
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@742 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-31 08:23:12 +00:00
james
524d968b59 ChangeLog edit
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@741 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-31 05:35:08 +00:00
james
79df31c85a svn merge -r 734:737 $SO/trunk/openvpn
Security fixes from 2.0.3


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@740 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-31 03:49:25 +00:00
james
c67d59cd5c Windows reliability changes:
* Added code to make sure that the local PATH environmental
variable points to the Windows system32 directory.
* Added new --ip-win32 adaptive mode which tries 'dynamic'
and then fails over to 'netsh' if the DHCP negotiation fails.
* Made --ip-win32 adaptive the default.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@739 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-31 03:01:17 +00:00
james
1df5be5981 Changes to Windows build configuration to
support lzo2 and openssl-0.9.7i.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@738 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-31 01:58:12 +00:00
james
ba3ff466e8 svn merge -r 672:731 $SO/trunk/openvpn
Merged multi.c:1586 assertion fix attempt
from trunk.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@732 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-26 23:46:30 +00:00
james
dfb4b0fa74 Merge with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@726
More PKCS11 fixes.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@727 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-25 21:10:28 +00:00
james
1f2c6877ad Merge with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@719
More PKCS#11 changes.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@720 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-25 17:28:54 +00:00
james
7f9811db02 Removed #warn from ssl.c
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@717 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-24 19:49:48 +00:00
james
33c8c4d4c2 Merge with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@712
(More pkcs11 changes)


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@713 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-24 00:38:40 +00:00
james
f71b35f457 ChangeLog edit
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@702 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 19:38:56 +00:00
james
5ad84585de Added actual remote address used to the ">STATE" alert
in the management interface (Rolf Fokkens).


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@701 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 19:00:56 +00:00
james
dd1047f521 Some changes to GET_USER_PASS_NEED_OK flag to
get_user_pass.
(1) Allow an additional longer prompt string
    to be passed to the management interface
    client, in addition to the request type
    string.
(2) Allow the management interface client to
    return a string, usually "ok" or "cancel"
    as the third argument to "needok" command.
(3) Renamed "ok" command in management interface
    to "needok".
(4) Edited management-notes.txt to reflect new
    needok feature.
(5) See init.c:125 for new code example.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@694 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 10:16:41 +00:00
james
ef7fb89057 ChangeLog edit
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@693 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 08:43:50 +00:00
james
c924134821 Modified get_default_gateway code for Linux
to return the route with the smallest metric
if multiple 0.0.0.0/0.0.0.0 entries are present.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@692 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 08:13:27 +00:00
james
348fb443b6 Modified get_default_gateway code for Windows
to return the route with the smallest metric
if multiple 0.0.0.0/0.0.0.0 entries are present.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@691 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 07:42:01 +00:00
james
6ccbd31bc4 Addition of M_NOLF to error.h means that we need
to repartition the msglevel bit packing.
Moved MUTE_LEVEL_SHIFT to 24, giving us
(1<<16) to (1<<23) for future msg flag
expansion.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@690 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 06:08:25 +00:00
james
984cf0036c Merged with Alon's r688.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@689 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-20 05:58:08 +00:00
james
f78687162b Make sure that install-win32/prebuild gets
the 8.3 version of the TAP-Win32 driver.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@683 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-19 15:42:01 +00:00
james
821659cbdf Moved socket setting log info to --verb 3 from 4.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@682 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-19 15:36:14 +00:00
james
c9ee6dee2b Allow OPT_P_SOCKFLAGS to be specified in
a client-specific config.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@681 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-19 14:10:41 +00:00
james
7b0a8146c7 svn merge -r 670:672 $SO/trunk/openvpn
Brought up-to-date with 2.0.x branch.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@673 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-19 07:50:13 +00:00
james
24076bd978 Merged with Alon's tree @ r660
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@665 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-18 09:39:00 +00:00
james
90e105d218 Fixed double fork bug.
Pre-2.1_beta5


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@656 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-17 13:20:21 +00:00
james
e1f07509eb Brought up-to-date with Alon's PKCS11 patch at
https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn@652
Pre-2.1_beta5


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@654 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-17 13:07:52 +00:00
james
6835555ef8 Brought up-to-date with Alon's PKCS11 patch at
https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn@645
Pre-2.1_beta5


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@648 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-17 07:39:41 +00:00
james
05d11e3d79 VERSION 2.1_beta4 (re-released)
--capath fix in ssl.c


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@641 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-16 13:39:20 +00:00
james
c13953e314 VERSION 2.1_beta4
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@640 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-16 13:00:37 +00:00
james
f49eab6232 Reverted plugin directory location.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@638 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-16 12:24:10 +00:00
james
024cbc3eeb ChangeLog edit
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@637 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-16 12:07:32 +00:00
james
7ef85434ed Fixed bug introduced in 2.1-beta3 where management
socket bind would fail.
Pre-2.1-beta4


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@635 e7ae566f-a301-0410-adde-c780ea21d3b5
2005-10-16 01:46:24 +00:00