- (stevesk) remove cli.[ch]

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index c37d3aa5fdb2c271b10b18b82557befbb3beb8e5..eca36b36a16024a15bae779c0d0f5a7877b5428f 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.20 2001/04/04 09:48:34 markus Exp $ */
+/*     $OpenBSD: kex.h,v 1.23 2001/06/23 02:34:28 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -95,7 +95,7 @@ struct Newkeys {
 struct Kex {
        u_char  *session_id;
        int     session_id_len;
-       Newkeys *keys[MODE_MAX];
+       Newkeys *newkeys[MODE_MAX];
        int     we_need;
        int     server;
        char    *name;
@@ -103,11 +103,11 @@ struct Kex {
        int     kex_type;
        Buffer  my;
        Buffer  peer;
-       int     newkeys;
+       int     done;
        int     flags;
        char    *client_version_string;
        char    *server_version_string;
-       int     (*check_host_key)(Key *hostkey);
+       int     (*verify_host_key)(Key *hostkey);
        Key     *(*load_host_key)(int type);
 };
 
@@ -115,7 +115,7 @@ Kex *kex_setup(char *proposal[PROPOSAL_MAX]);
 void   kex_finish(Kex *kex);
 
 void   kex_send_kexinit(Kex *kex);
-void   kex_protocol_error(int type, int plen, void *ctxt);
+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 *);