- (tim) [buildpkg.sh.in] Make the names consistent.

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 52d442e9a7d19b39068f7cc534f714e01f215dca..bbd931e049df7ad068f6ca77739a9ff34165ade2 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */
+/*     $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $    */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -31,8 +31,13 @@
 #include "cipher.h"
 #include "key.h"
 
-#define        KEX_DH1         "diffie-hellman-group1-sha1"
-#define        KEX_DHGEX       "diffie-hellman-group-exchange-sha1"
+#define        KEX_DH1                 "diffie-hellman-group1-sha1"
+#define        KEX_DH14                "diffie-hellman-group14-sha1"
+#define        KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
+
+#define COMP_NONE      0
+#define COMP_ZLIB      1
+#define COMP_DELAYED   2
 
 enum kex_init_proposals {
        PROPOSAL_KEX_ALGS,
@@ -56,6 +61,7 @@ enum kex_modes {
 
 enum kex_exchange {
        KEX_DH_GRP1_SHA1,
+       KEX_DH_GRP14_SHA1,
        KEX_DH_GEX_SHA1,
        KEX_MAX
 };
@@ -81,9 +87,9 @@ struct Mac {
        char    *name;
        int     enabled;
        const EVP_MD    *md;
-       int     mac_len;
+       u_int   mac_len;
        u_char  *key;
-       int     key_len;
+       u_int   key_len;
 };
 struct Comp {
        int     type;
@@ -99,7 +105,7 @@ struct Kex {
        u_char  *session_id;
        u_int   session_id_len;
        Newkeys *newkeys[MODE_MAX];
-       int     we_need;
+       u_int   we_need;
        int     server;
        char    *name;
        int     hostkey_type;
@@ -108,6 +114,7 @@ struct Kex {
        Buffer  peer;
        int     done;
        int     flags;
+       const EVP_MD *evp_md;
        char    *client_version_string;
        char    *server_version_string;
        int     (*verify_host_key)(Key *);
@@ -121,7 +128,7 @@ void         kex_finish(Kex *);
 
 void    kex_send_kexinit(Kex *);
 void    kex_input_kexinit(int, u_int32_t, void *);
-void    kex_derive_keys(Kex *, u_char *, BIGNUM *);
+void    kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *);
 
 Newkeys *kex_get_newkeys(int);
 
@@ -130,12 +137,16 @@ void       kexdh_server(Kex *);
 void    kexgex_client(Kex *);
 void    kexgex_server(Kex *);
 
-u_char *
+void
 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 *);
+    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 *);
+
+void
+derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
 void   dump_digest(char *, u_char *, int);