===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.h,v
retrieving revision 1.35.4.2
retrieving revision 1.36
diff -u -r1.35.4.2 -r1.36
--- src/usr.bin/ssh/kex.h	2006/02/03 02:53:44	1.35.4.2
+++ src/usr.bin/ssh/kex.h	2005/06/17 02:44:32	1.36
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kex.h,v 1.35.4.2 2006/02/03 02:53:44 brad Exp $	*/
+/*	$OpenBSD: kex.h,v 1.36 2005/06/17 02:44:32 djm Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -31,14 +31,10 @@
 #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_DH1		"diffie-hellman-group1-sha1"
+#define	KEX_DH14	"diffie-hellman-group14-sha1"
+#define	KEX_DHGEX	"diffie-hellman-group-exchange-sha1"
 
-#define COMP_NONE	0
-#define COMP_ZLIB	1
-#define COMP_DELAYED	2
-
 enum kex_init_proposals {
 	PROPOSAL_KEX_ALGS,
 	PROPOSAL_SERVER_HOST_KEY_ALGS,
@@ -114,7 +110,6 @@
 	Buffer	peer;
 	int	done;
 	int	flags;
-	const EVP_MD *evp_md;
 	char	*client_version_string;
 	char	*server_version_string;
 	int	(*verify_host_key)(Key *);
@@ -128,7 +123,7 @@
 
 void	 kex_send_kexinit(Kex *);
 void	 kex_input_kexinit(int, u_int32_t, void *);
-void	 kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *);
+void	 kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
 Newkeys *kex_get_newkeys(int);
 
@@ -137,13 +132,12 @@
 void	 kexgex_client(Kex *);
 void	 kexgex_server(Kex *);
 
-void
+u_char *
 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    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 *, 
-    BIGNUM *, BIGNUM *, u_char **, u_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 *);
 
 void
 derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);