X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/63284fbbb88cc0de8c33b78a2faa747f63783baa..0d942eff10bfa688efa701abf8a08fe8fcfe4f24:/kex.h

diff --git a/kex.h b/kex.h
index 755bf332..52d442e9 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kex.h,v 1.29 2002/02/14 23:41:01 markus Exp $	*/
+/*	$OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -55,8 +55,9 @@ enum kex_modes {
 };
 
 enum kex_exchange {
-	DH_GRP1_SHA1,
-	DH_GEX_SHA1
+	KEX_DH_GRP1_SHA1,
+	KEX_DH_GEX_SHA1,
+	KEX_MAX
 };
 
 #define KEX_INIT_SENT	0x0001
@@ -79,7 +80,7 @@ struct Enc {
 struct Mac {
 	char	*name;
 	int	enabled;
-	EVP_MD	*md;
+	const EVP_MD	*md;
 	int	mac_len;
 	u_char	*key;
 	int	key_len;
@@ -96,7 +97,7 @@ struct Newkeys {
 };
 struct Kex {
 	u_char	*session_id;
-	int	session_id_len;
+	u_int	session_id_len;
 	Newkeys	*newkeys[MODE_MAX];
 	int	we_need;
 	int	server;
@@ -111,6 +112,8 @@ struct Kex {
 	char	*server_version_string;
 	int	(*verify_host_key)(Key *);
 	Key	*(*load_host_key)(int);
+	int	(*host_key_index)(Key *);
+	void	(*kex[KEX_MAX])(Kex *);
 };
 
 Kex	*kex_setup(char *[PROPOSAL_MAX]);
@@ -120,11 +123,20 @@ void	 kex_send_kexinit(Kex *);
 void	 kex_input_kexinit(int, u_int32_t, void *);
 void	 kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
-void	 kexdh(Kex *);
-void	 kexgex(Kex *);
-
 Newkeys *kex_get_newkeys(int);
 
+void	 kexdh_client(Kex *);
+void	 kexdh_server(Kex *);
+void	 kexgex_client(Kex *);
+void	 kexgex_server(Kex *);
+
+u_char *
+kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, 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 *);
+
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
 void	dump_digest(char *, u_char *, int);
 #endif