Prepare v2.3.15 release

Signed-off-by: David Sommerseth <davids@openvpn.net>

diff --git a/ChangeLog b/ChangeLog
index 86d2b7a63d7ab5524b1af9147874bb97f57ba685..9117d9d442dcdb084c47dcec6c6575fa8fbcbbf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,29 @@
 OpenVPN Change Log
 Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2017.05.11 -- Version 2.3.15
+David Sommerseth (5):
+      dev-tools: Added script for updating copyright years in files
+      Update copyrights
+      docs: Further improve --reneg-bytes and SWEET32 information
+      git: Merge .gitignore files into a single file
+      Make --cipher/--auth none more explicit on the risks
+
+Gert Doering (1):
+      Document --proto udp6, tcp6, etc.
+
+Julien Muchembled (1):
+      Fix implicit declarations when HAVE_OPENSSL_ENGINE is unset
+
+Steffan Karger (6):
+      Add missing includes in error.h
+      cleanup: merge packet_id_alloc_outgoing() into packet_id_write()
+      Document that OpenVPN 2.3 does not check the CRL signature
+      Introduce and use secure_memzero() to erase secrets
+      Drop packets instead of assert out if packet id rolls over (CVE-2017-7479)
+      Don't assert out on receiving too-large control packets (CVE-2017-7478)
+
+
 2016.12.06 -- Version 2.3.14
 Christian Hesse (1):
       update year in copyright message

diff --git a/version.m4 b/version.m4
index 33670f854985a35b35d9a011b4823277fc68870d..a052728d9946419de068b6262056bdddc2e6aac8 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,9 +1,9 @@
 dnl define the OpenVPN version
 define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
-define([PRODUCT_VERSION], [2.3.14])
+define([PRODUCT_VERSION], [2.3.15])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
-define([PRODUCT_VERSION_RESOURCE], [2,3,14,0])
+define([PRODUCT_VERSION_RESOURCE], [2,3,15,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])