Releasing 1.0.24.

diff --git a/NEWS b/NEWS
index 8628bcb217e26937bcdde7fa53a0473f09e73900..191f645cb8822c534e16d9ec2214cf3818c257e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+Version 1.0.24               May 11 2013
+
+ * Various compiler hardening flags are enabled by default.
+
+ * Updated support for Solaris, allowing switch mode on Solaris 11.
+
+ * Configuration will now also be read from a conf.d directory.
+
+ * Various updates to the documentation.
+
+ * Tinc now forces glibc to reload /etc/resolv.conf after it receives SIGALRM.
+
+ * Fixed a potential routing loop when IndirectData or TCPOnly is used and
+   broadcast packets are being sent.
+
+ * Improved security with constant time memcmp and stricter use of OpenSSL's
+   RNG functions.
+
+ * Fixed all issues found by Coverity.
+
+Thanks to Florent Clairambault, Vilbrekin, luckyhacky, Armin Fisslthaler, Loïc
+Dachary and Steffan Karger for their contributions to this version of tinc.
+
 Version 1.0.23               October 19 2013
 
  * Start authentication immediately on outgoing connections (useful for sslh).

diff --git a/README b/README
index 0f8a9a555e9482dad9965304e2d036c397bbe845..49fc1dc7f9f44bbc69be6036735c2430dc7650f5 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.23. Installation
+This is the README file for tinc version 1.0.24. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2013 by:
+tinc is Copyright (C) 1998-2014 by:
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.23 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.24 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 

diff --git a/THANKS b/THANKS
index 65ab166f94525ce743b659a1c282a46b5c8cba82..1444b548f8295f5015aa09e1cdd2858859aa8cd3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -4,6 +4,7 @@ We would like to thank the following people for their contributions to tinc:
 * Allesandro Gatti
 * Andreas van Cranenburgh
 * Anthony G. Basile
+* Armin Fisslthaler
 * Armijn Hemel
 * Brandon Black
 * Cris van Pelt
@@ -26,6 +27,7 @@ We would like to thank the following people for their contributions to tinc:
 * Jerome Etienne
 * Julien Muchembled
 * Lavrans Laading
+* Loïc Dachary
 * Loïc Grenié
 * Lubomír Bulej
 * Mads Kiilerich
@@ -49,6 +51,7 @@ We would like to thank the following people for their contributions to tinc:
 * Robert van der Meulen
 * Rumko
 * Scott Lamb
+* Steffan Karger
 * Sven-Haegar Koch
 * Teemu Kiviniemi
 * Timothy Redaelli

diff --git a/configure.ac b/configure.ac
index baa0224fc8fb431bdcb11adde803e51a422b8244..bb2dc802083bcd9f674b0959804b65d10b0932cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([tinc], [1.0.23])
+AC_INIT([tinc], [1.0.24])
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc -Wall])
 AC_CONFIG_HEADERS([config.h])

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 00e4674ced64f708a2448abc5ebbd10f65481d49..0548628f623e2fc53c89e0dd697e1f114a3d8260 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -1,4 +1,4 @@
-.Dd 2010-01-16
+.Dd 2014-05-11
 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/doc/tinc.texi b/doc/tinc.texi
index ba1f9b51523e26af62c9813af3010c4be6bceb13..857900285639d21962ee9db28ac0793bbea39cba 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -15,7 +15,7 @@
 
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2013 Ivo Timmermans,
+Copyright @copyright{} 1998-2014 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
@@ -39,7 +39,7 @@ permission notice identical to this one.
 @vskip 0pt plus 1filll
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2013 Ivo Timmermans,
+Copyright @copyright{} 1998-2014 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

diff --git a/doc/tincd.8.in b/doc/tincd.8.in
index b117e8a922925e10e72146dc1abe959a7bb73d8c..d200c48f0226d0347388c058dd5616337d13f8bc 100644 (file)
--- a/doc/tincd.8.in
+++ b/doc/tincd.8.in
@@ -1,4 +1,4 @@
-.Dd 2011-01-02
+.Dd 2014-05-11
 .Dt TINCD 8
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/src/avl_tree.c b/src/avl_tree.c
index 22d7ff5d887931a9413e713e1c2534181bdcb1c4..6b8551655e37189265fa54c019b515397b2e4c3b 100644 (file)
--- a/src/avl_tree.c
+++ b/src/avl_tree.c
@@ -2,7 +2,7 @@
     avl_tree.c -- avl_ tree and linked list convenience
     Copyright (C) 1998 Michael H. Buselli
                   2000-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2000-2005 Wessel Dankers <wsl@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/conf.c b/src/conf.c
index 09f2d1384ea94a8f0c181b872e5cf2dd688ae1ef..99bf381eff554efb196adcfc12ba5e2f4d695491 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,7 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                  2000 Cris van Pelt
 

diff --git a/src/graph.c b/src/graph.c
index 73dadc47f6152c300a4f9924536d9474ca22c489..8ffd70e455892935b2675bcfa6a1f5061761f737 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2014 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/have.h b/src/have.h
index a96dd7da3ae2ca7ffc9b46d66b23e49cc40c0e88..bcd46127a5c49b00dbfc5ef4601db0fe48d4fc8f 100644 (file)
--- a/src/have.h
+++ b/src/have.h
@@ -1,7 +1,7 @@
 /*
     have.h -- include headers which are known to exist
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/linux/device.c b/src/linux/device.c
index b4360a6a88e39220417eec816948a8cbbdc3d9a7..66e790a5b8fc3cce80f762dfe6c2d2ae8652e23b 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/meta.c b/src/meta.c
index 0b8a379b2b70bc87c8e527aa8d249dbfe8005dfe..e62c3b7d859230202834aa5638b76800012f4a28 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2006      Scott Lamb <slamb@slamb.org>
 

diff --git a/src/net_packet.c b/src/net_packet.c
index 4341cf01f76c4754cb7ff5f74d019a38510abad1..d11d58ad2b899ea4600c5df27a4e4fa4c371b3b6 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2010      Timothy Redaelli <timothy@redaelli.eu>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/net_setup.c b/src/net_setup.c
index 34e042ad59fbd217bf6962d93563c491a1918f26..fa4e9867a4d300215c1f45e4fcb728f1608faf0f 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 22d2ff5403c4ff9e001169cc7ca1cb71d66f280f..301ead5da6e4acb3ad8ef1fe6a33d72f4bf06e13 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,7 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index a5cd835c26294583f5e3fd23b91185a3cad76bf9..427fb3f763db7ac4eadc8f2908ddab08d6dc55b7 100644 (file)
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 3ccc67f0de317416f8b475fd2e13e5ffcf1dc121..af771ba8c5897022a8ef4711a28a19148210dab0 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -2,7 +2,7 @@
     device.c -- Interaction with Solaris tun device
     Copyright (C) 2001-2005 Ivo Timmermans,
                   2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
-                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tincd.c b/src/tincd.c
index d15d2ffaf5bfcd8b72a0973b40f0eb8c1037c08e..b6a6c29cd39384d14df10f437a4acd3694046801 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -549,7 +549,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"

diff --git a/src/utils.c b/src/utils.c
index c629ae0b50cd94a5b0169ca868e6f2c55357a525..555ea50d7461b38c9a000bfe559e10ed275e0ccf 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
     Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/utils.h b/src/utils.h
index 7ab29d2ced15f91a706e3e1c755c8dda4c4357f7..4d447b1f4fa1f7987a70da5a57d8d35308b2b5d3 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,7 +1,7 @@
 /*
     utils.h -- header file for utils.c
     Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by