===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.26.2.4
retrieving revision 1.27
diff -u -r1.26.2.4 -r1.27
--- src/usr.bin/ssh/kex.h	2002/10/11 14:53:06	1.26.2.4
+++ src/usr.bin/ssh/kex.h	2001/12/20 22:50:24	1.27
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kex.h,v 1.26.2.4 2002/10/11 14:53:06 miod Exp $	*/
+/*	$OpenBSD: kex.h,v 1.27 2001/12/20 22:50:24 djm Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -71,15 +71,13 @@
 	char	*name;
 	Cipher	*cipher;
 	int	enabled;
-	u_int	key_len;
-	u_int	block_size;
 	u_char	*key;
 	u_char	*iv;
 };
 struct Mac {
 	char	*name;
 	int	enabled;
-	const EVP_MD	*md;
+	EVP_MD	*md;
 	int	mac_len;
 	u_char	*key;
 	int	key_len;
@@ -96,7 +94,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;
@@ -111,14 +109,13 @@
 	char	*server_version_string;
 	int	(*verify_host_key)(Key *);
 	Key	*(*load_host_key)(int);
-	int	(*host_key_index)(Key *);
 };
 
 Kex	*kex_setup(char *[PROPOSAL_MAX]);
 void	 kex_finish(Kex *);
 
 void	 kex_send_kexinit(Kex *);
-void	 kex_input_kexinit(int, u_int32_t, void *);
+void	 kex_input_kexinit(int, int, u_int32_t, void *);
 void	 kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
 void	 kexdh(Kex *);