===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.30.2.3
retrieving revision 1.31
diff -u -r1.30.2.3 -r1.31
--- src/usr.bin/ssh/kex.h	2003/04/03 22:35:17	1.30.2.3
+++ src/usr.bin/ssh/kex.h	2002/05/16 22:02:50	1.31
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kex.h,v 1.30.2.3 2003/04/03 22:35:17 miod Exp $	*/
+/*	$OpenBSD: kex.h,v 1.31 2002/05/16 22:02:50 markus Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -55,9 +55,8 @@
 };
 
 enum kex_exchange {
-	KEX_DH_GRP1_SHA1,
-	KEX_DH_GEX_SHA1,
-	KEX_MAX
+	DH_GRP1_SHA1,
+	DH_GEX_SHA1
 };
 
 #define KEX_INIT_SENT	0x0001
@@ -97,7 +96,7 @@
 };
 struct Kex {
 	u_char	*session_id;
-	u_int	session_id_len;
+	int	session_id_len;
 	Newkeys	*newkeys[MODE_MAX];
 	int	we_need;
 	int	server;
@@ -113,7 +112,6 @@
 	int	(*verify_host_key)(Key *);
 	Key	*(*load_host_key)(int);
 	int	(*host_key_index)(Key *);
-	void	(*kex[KEX_MAX])(Kex *);
 };
 
 Kex	*kex_setup(char *[PROPOSAL_MAX]);
@@ -123,19 +121,10 @@
 void	 kex_input_kexinit(int, u_int32_t, void *);
 void	 kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
-Newkeys *kex_get_newkeys(int);
+void	 kexdh(Kex *);
+void	 kexgex(Kex *);
 
-void	 kexdh_client(Kex *);
-void	 kexdh_server(Kex *);
-void	 kexgex_client(Kex *);
-void	 kexgex_server(Kex *);
-
-u_char *
-kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    BIGNUM *, BIGNUM *, BIGNUM *);
-u_char *
-kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
+Newkeys *kex_get_newkeys(int);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
 void	dump_digest(char *, u_char *, int);