- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 90496fbdf461be3174e90e409fff5cafd938a115..1fa13799d6c2dcf7d179a0c8ce2b9f87c6f319a2 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: kex.h,v 1.14 2001/02/11 12:59:24 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.48 2009/10/24 11:13:54 andreas Exp $ */
 
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,11 +26,21 @@
 #ifndef KEX_H
 #define KEX_H
 
+#include <signal.h>
 #include <openssl/evp.h>
-#include "buffer.h"
+#include <openssl/hmac.h>
 
-#define        KEX_DH1         "diffie-hellman-group1-sha1"
-#define        KEX_DHGEX       "diffie-hellman-group-exchange-sha1"
+#define KEX_COOKIE_LEN 16
+
+#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        KEX_RESUME              "resume@appgate.com"
+
+#define COMP_NONE      0
+#define COMP_ZLIB      1
+#define COMP_DELAYED   2
 
 enum kex_init_proposals {
        PROPOSAL_KEX_ALGS,
@@ -53,82 +63,101 @@ enum kex_modes {
 };
 
 enum kex_exchange {
-       DH_GRP1_SHA1,
-       DH_GEX_SHA1
+       KEX_DH_GRP1_SHA1,
+       KEX_DH_GRP14_SHA1,
+       KEX_DH_GEX_SHA1,
+       KEX_DH_GEX_SHA256,
+       KEX_MAX
 };
 
+#define KEX_INIT_SENT  0x0001
+
 typedef struct Kex Kex;
 typedef struct Mac Mac;
 typedef struct Comp Comp;
 typedef struct Enc Enc;
+typedef struct Newkeys Newkeys;
 
 struct Enc {
-       char            *name;
-       Cipher          *cipher;
-       int             enabled;
+       char    *name;
+       Cipher  *cipher;
+       int     enabled;
+       u_int   key_len;
+       u_int   block_size;
        u_char  *key;
        u_char  *iv;
 };
 struct Mac {
-       char            *name;
-       int             enabled;
-       EVP_MD          *md;
-       int             mac_len;
+       char    *name;
+       int     enabled;
+       u_int   mac_len;
        u_char  *key;
-       int             key_len;
+       u_int   key_len;
+       int     type;
+       const EVP_MD    *evp_md;
+       HMAC_CTX        evp_ctx;
+       struct umac_ctx *umac_ctx;
 };
 struct Comp {
-       int             type;
-       int             enabled;
-       char            *name;
+       int     type;
+       int     enabled;
+       char    *name;
+};
+struct Newkeys {
+       Enc     enc;
+       Mac     mac;
+       Comp    comp;
 };
 struct Kex {
-       Enc             enc [MODE_MAX];
-       Mac             mac [MODE_MAX];
-       Comp            comp[MODE_MAX];
-       int             we_need;
-       int             server;
-       char            *name;
-       int             hostkey_type;
-       int             kex_type;
+       u_char  *session_id;
+       u_int   session_id_len;
+       Newkeys *newkeys[MODE_MAX];
+       u_int   we_need;
+       int     server;
+       char    *name;
+       int     hostkey_type;
+       int     kex_type;
+       int     roaming;
+       Buffer  my;
+       Buffer  peer;
+       sig_atomic_t done;
+       int     flags;
+       const EVP_MD *evp_md;
+       char    *client_version_string;
+       char    *server_version_string;
+       int     (*verify_host_key)(Key *);
+       Key     *(*load_host_key)(int);
+       int     (*host_key_index)(Key *);
+       void    (*kex[KEX_MAX])(Kex *);
 };
 
-Buffer *kex_init(char *myproposal[PROPOSAL_MAX]);
+Kex    *kex_setup(char *[PROPOSAL_MAX]);
+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 *, u_int, BIGNUM *);
+
+Newkeys *kex_get_newkeys(int);
+
+void    kexdh_client(Kex *);
+void    kexdh_server(Kex *);
+void    kexgex_client(Kex *);
+void    kexgex_server(Kex *);
+
+void
+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 *);
+
 void
-kex_exchange_kexinit(
-    Buffer *my_kexinit, Buffer *peer_kexint,
-    char *peer_proposal[PROPOSAL_MAX]);
-Kex *
-kex_choose_conf(char *cprop[PROPOSAL_MAX],
-    char *sprop[PROPOSAL_MAX], int server);
-int    kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
-void   packet_set_kex(Kex *k);
-int    dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
-DH     *dh_new_group_asc(const char *, const char *);
-DH     *dh_new_group(BIGNUM *, BIGNUM *);
-void   dh_gen_key(DH *);
-DH     *dh_new_group1(void);
-
-u_char *
-kex_hash(
-    char *client_version_string,
-    char *server_version_string,
-    char *ckexinit, int ckexinitlen,
-    char *skexinit, int skexinitlen,
-    char *serverhostkeyblob, int sbloblen,
-    BIGNUM *client_dh_pub,
-    BIGNUM *server_dh_pub,
-    BIGNUM *shared_secret);
-
-u_char *
-kex_hash_gex(
-    char *client_version_string,
-    char *server_version_string,
-    char *ckexinit, int ckexinitlen,
-    char *skexinit, int skexinitlen,
-    char *serverhostkeyblob, int sbloblen,
-    int minbits, BIGNUM *prime, BIGNUM *gen,
-    BIGNUM *client_dh_pub,
-    BIGNUM *server_dh_pub,
-    BIGNUM *shared_secret);
+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);
+#endif
+
 #endif