===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.37.2.2
retrieving revision 1.38
diff -u -r1.37.2.2 -r1.38
--- src/usr.bin/ssh/kex.h	2006/10/06 03:19:32	1.37.2.2
+++ src/usr.bin/ssh/kex.h	2005/11/04 05:15:59	1.38
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.37.2.2 2006/10/06 03:19:32 brad Exp $ */
+/*	$OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,11 +27,13 @@
 #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"
 #define	KEX_DHGEX_SHA1		"diffie-hellman-group-exchange-sha1"
-#define	KEX_DHGEX_SHA256	"diffie-hellman-group-exchange-sha256"
 
 #define COMP_NONE	0
 #define COMP_ZLIB	1
@@ -61,7 +63,6 @@
 	KEX_DH_GRP1_SHA1,
 	KEX_DH_GRP14_SHA1,
 	KEX_DH_GEX_SHA1,
-	KEX_DH_GEX_SHA256,
 	KEX_MAX
 };
 
@@ -111,7 +112,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 +142,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