--- a/kex.h	Tue Jul 20 12:06:37 2004 +0000
+++ b/kex.h	Mon Jul 26 02:44:20 2004 +0000
@@ -26,17 +26,25 @@
 #define _KEX_H_
 
 #include "includes.h"
+#include "algo.h"
 
 void send_msg_kexinit();
 void recv_msg_kexinit();
-void send_dh_kex();
-void recv_msg_kexdh_init();
 void send_msg_newkeys();
 void recv_msg_newkeys();
 void kexinitialise();
+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 svr_read_kex();
-void cli_read_kex();
+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
+void recv_msg_kexdh_reply(); // client
 
 extern const unsigned char dh_p_val[];
 #define DH_P_LEN 128 /* The length of the dh_p_val array */