X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=0d9e7863d4146e97cadb66f64012050d2414f859;hp=d9719ca49df40c06b58d2628190a4348edc76ece;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hpb=e012e752f4f1a2b06dfab4640bbbea8f084999ff

diff --git a/src/protocol_key.c b/src/protocol_key.c
index d9719ca4..0d9e7863 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -16,8 +16,6 @@
     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$
 */
 
 #include "system.h"
@@ -49,7 +47,7 @@ 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)
@@ -154,6 +152,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
@@ -172,7 +171,7 @@ bool send_ans_key(node_t *to)
 	// Convert to hexadecimal and send
 	key = alloca(2 * to->inkeylength + 1);
 	bin2hex(to->inkey, key, to->inkeylength);
-	key[to->outkeylength * 2] = '\0';
+	key[to->inkeylength * 2] = '\0';
 
 	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
 			myself->name, to->name, key,