X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=cd95d9c425e93f4316c83fab01aa9b6928ac4765;hp=64225fd2e1c5611ec7ec93cefdf7ac148b783f9e;hb=5dde6461a321ee47b06e33f8203f2acf00a31a51;hpb=ca5b67111e4d797d15623c2163f67fe489dc3bf2

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 64225fd2..cd95d9c4 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -38,8 +36,7 @@
 
 bool mykeyused = false;
 
-bool send_key_changed()
-{
+bool send_key_changed() {
 	cp();
 
 	/* Only send this message if some other daemon requested our key previously.
@@ -49,11 +46,10 @@ bool send_key_changed()
 	if(!mykeyused)
 		return true;
 
-	return send_request(broadcast, "%d %lx %s", KEY_CHANGED, random(), myself->name);
+	return send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
 }
 
-bool key_changed_h(connection_t *c)
-{
+bool key_changed_h(connection_t *c) {
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
@@ -87,15 +83,13 @@ bool key_changed_h(connection_t *c)
 	return true;
 }
 
-bool send_req_key(node_t *to)
-{
+bool send_req_key(node_t *to) {
 	cp();
 
 	return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
 }
 
-bool req_key_h(connection_t *c)
-{
+bool req_key_h(connection_t *c) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
@@ -144,8 +138,7 @@ bool req_key_h(connection_t *c)
 	return true;
 }
 
-bool send_ans_key(node_t *to)
-{
+bool send_ans_key(node_t *to) {
 	char *key;
 
 	cp();
@@ -154,6 +147,7 @@ bool send_ans_key(node_t *to)
 	to->incipher = myself->incipher;
 	to->inkeylength = myself->inkeylength;
 	to->indigest = myself->indigest;
+	to->inmaclength = myself->inmaclength;
 	to->incompression = myself->incompression;
 
 	// Allocate memory for key
@@ -181,8 +175,7 @@ bool send_ans_key(node_t *to)
 			to->incompression);
 }
 
-bool ans_key_h(connection_t *c)
-{
+bool ans_key_h(connection_t *c) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];