===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.38.2.1
retrieving revision 1.39
diff -u -r1.38.2.1 -r1.39
--- src/usr.bin/ssh/kex.h	2006/09/30 04:06:50	1.38.2.1
+++ src/usr.bin/ssh/kex.h	2006/03/07 09:07:40	1.39
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.38.2.1 2006/09/30 04:06:50 brad Exp $ */
+/*	$OpenBSD: kex.h,v 1.39 2006/03/07 09:07:40 djm Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,6 +27,9 @@
 #define KEX_H
 
 #include <openssl/evp.h>
+#include "buffer.h"
+#include "cipher.h"
+#include "key.h"
 
 #define	KEX_DH1			"diffie-hellman-group1-sha1"
 #define	KEX_DH14		"diffie-hellman-group14-sha1"
@@ -111,7 +114,7 @@
 	int	kex_type;
 	Buffer	my;
 	Buffer	peer;
-	sig_atomic_t done;
+	int	done;
 	int	flags;
 	const EVP_MD *evp_md;
 	char	*client_version_string;
@@ -141,7 +144,7 @@
     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
 void
 kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
-    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
+    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, 
     BIGNUM *, BIGNUM *, u_char **, u_int *);
 
 void