--- a/kex.h	Tue Jul 27 15:12:29 2004 +0000
+++ b/kex.h	Tue Jul 27 16:30:46 2004 +0000
@@ -32,15 +32,11 @@
 void recv_msg_kexinit();
 void send_msg_newkeys();
 void recv_msg_newkeys();
-void kexinitialise();
+void kexfirstinitialise();
 void gen_kexdh_vals(mp_int *dh_pub, mp_int *dh_priv);
 void kexdh_comb_key(mp_int *dh_pub_us, mp_int *dh_priv, mp_int *dh_pub_them,
 		sign_key *hostkey);
 
-void read_kex_algos(
-		algo_type*(buf_match_algo)(buffer*buf, algo_type localalgos[],
-			int *goodguess));
-
 void recv_msg_kexdh_init(); // server
 
 void send_msg_kexdh_init(); // client
@@ -59,6 +55,9 @@
 	unsigned sentnewkeys : 1; /* set once we've send/recv'ed MSG_NEWKEYS*/
 	unsigned recvnewkeys : 1;
 
+	unsigned donefirstkex : 1; /* Set to 1 after the first kex has completed,
+								  ie the transport layer has been set up */
+
 	long lastkextime; /* time of the last kex */
 	unsigned int datatrans; /* data transmitted since last kex */
 	unsigned int datarecv; /* data received since last kex */