Version 2.1_beta15 released

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

3 files changed, 49 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1af30a5..b5eb95b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,53 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
+2006.09.12 -- Version 2.1-beta15
+
+* Windows installer updated with OpenSSL 0.9.7k DLLs to fix
+  RSA Signature Forgery (CVE-2006-4339).
+
+* Fixed bug introduced with the --port-share directive
+  (back in 2.1-beta9 which causes TLS soft resets
+  (1 per hour by default) in TCP server mode to force
+  a blockage of tunnel packets and later time-out and
+  restart the connection.
+
+* pkcs11 changes: 
+  1. Modified ssl.c to not FATAL and return to init.c
+     so auth-retry will work.
+  2. Modifed pkcs11-helper.c to fix some problem with
+     multiple providers.
+  3. Updated makefile.w32-vc to include lladdr.*, updated
+     linkage libraries.
+  4. Modified lladdr.c to be compiled under visual C.
+  5. Added retry counter to PKCS#11 PIN hook.
+  6. Modified PKCS#11 PIN retry loop to return correct error
+     code when PIN is incorrect.
+  7. Fix handling (ignoring) zero sized attributes.
+  8. Fix gcc-2 issues.
+  9. Fix openssl 0.9.6 (first version) issues.
+  10. easy-rsa Makefile (install) is now available so that
+      distribs will be able to install it safely.
+
+* Added two new management states:
+   OPENVPN_STATE_RESOLVE      -- DNS lookup
+   OPENVPN_STATE_TCP_CONNECT  -- Connecting to TCP server
+
+* Echo management state change to log.
+
+* Minor syshead.h change for NetBSD to allow
+  TCP_NODELAY flag to work.
+
+* Modified --port-share code to remove the assumption that
+  CMSG_SPACE always evaluates to a constant, to enable
+  compilation on NetBSD and possibly other BSDs as well.
+
+* Eliminated gcc 3.3.3 warnings on NetBSD
+  when ./configure --enable-strict is used.
+
+* Added optional minimum-number-of-bytes parameter
+  to --inactive directive.
+
 2006.04.13 -- Version 2.1-beta14
 
 * Fixed Windows server bug in time backtrack handling code which
diff --git a/configure.ac b/configure.ac
index cc30edc..fcd0ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 
-AC_INIT([OpenVPN], [2.1_beta14b], [openvpn-users@lists.sourceforge.net], [openvpn])
+AC_INIT([OpenVPN], [2.1_beta15], [openvpn-users@lists.sourceforge.net], [openvpn])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(syshead.h)
 
diff --git a/install-win32/prebuild b/install-win32/prebuild
index a8a160e..2c0c172 100755
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -18,7 +18,7 @@ OUT=$H/21
 IN=/y/openvpn/21/openvpn
 
 # Already built OpenSSL tree.
-SSL=$H/openssl-0.9.7i
+SSL=$H/openssl-0.9.7k
 
 # Already built LZO tree.
 LZO=$H/lzo-2.02