===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.22.2.3
retrieving revision 1.23
diff -u -r1.22.2.3 -r1.23
--- src/usr.bin/ssh/kex.h	2002/06/02 22:56:10	1.22.2.3
+++ src/usr.bin/ssh/kex.h	2001/06/23 02:34:28	1.23
@@ -1,7 +1,7 @@
-/*	$OpenBSD: kex.h,v 1.22.2.3 2002/06/02 22:56:10 miod Exp $	*/
+/*	$OpenBSD: kex.h,v 1.23 2001/06/23 02:34:28 markus Exp $	*/
 
 /*
- * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -71,8 +71,6 @@
 	char	*name;
 	Cipher	*cipher;
 	int	enabled;
-	u_int	key_len;
-	u_int	block_size;
 	u_char	*key;
 	u_char	*iv;
 };
@@ -109,25 +107,24 @@
 	int	flags;
 	char	*client_version_string;
 	char	*server_version_string;
-	int	(*verify_host_key)(Key *);
-	Key	*(*load_host_key)(int);
-	int	(*host_key_index)(Key *);
+	int	(*verify_host_key)(Key *hostkey);
+	Key	*(*load_host_key)(int type);
 };
 
-Kex	*kex_setup(char *[PROPOSAL_MAX]);
-void	 kex_finish(Kex *);
+Kex	*kex_setup(char *proposal[PROPOSAL_MAX]);
+void	kex_finish(Kex *kex);
 
-void	 kex_send_kexinit(Kex *);
-void	 kex_input_kexinit(int, u_int32_t, void *);
-void	 kex_derive_keys(Kex *, u_char *, BIGNUM *);
+void	kex_send_kexinit(Kex *kex);
+void	kex_input_kexinit(int type, int plen, void *ctxt);
+void	kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
 
-void	 kexdh(Kex *);
-void	 kexgex(Kex *);
+void	kexdh(Kex *);
+void	kexgex(Kex *);
 
-Newkeys *kex_get_newkeys(int);
+Newkeys *kex_get_newkeys(int mode);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
-void	dump_digest(char *, u_char *, int);
+void	dump_digest(char *msg, u_char *digest, int len);
 #endif
 
 #endif