diff kex.h @ 623:895fbe068f2c

Fix case where "-K 1" would cause a SSH_MSG_IGNORE packet to be sent with the wrong encryption key ("bad packet length" symptom) while key exchange was happening.
author Matt Johnston <matt@ucc.asn.au>
date Tue, 07 Jun 2011 11:55:44 +0000
parents d58c478bd399
children 2b1bb792cd4d d44325108d0e b07eb3dc23ec
line wrap: on
line diff
--- a/kex.h	Tue Jun 07 11:08:47 2011 +0000
+++ b/kex.h	Tue Jun 07 11:55:44 2011 +0000
@@ -52,8 +52,8 @@
 	unsigned sentkexinit : 1; /*set when we've sent/recv kexinit packet */
 	unsigned recvkexinit : 1;
 	unsigned firstfollows : 1; /* true when first_kex_packet_follows is set */
-	unsigned sentnewkeys : 1; /* set once we've send/recv'ed MSG_NEWKEYS*/
-	unsigned recvnewkeys : 1;
+	unsigned sentnewkeys : 1; /* set once we've send MSG_NEWKEYS (will be cleared once we have also received */
+	unsigned recvnewkeys : 1; /* set once we've received MSG_NEWKEYS (cleared once we have also sent */
 
 	unsigned donefirstkex : 1; /* Set to 1 after the first kex has completed,
 								  ie the transport layer has been set up */