-/* $OpenBSD: kex.h,v 1.23 2001/06/23 02:34:28 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.35 2004/06/13 12:53:24 djm 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
#include "key.h"
#define KEX_DH1 "diffie-hellman-group1-sha1"
+#define KEX_DH14 "diffie-hellman-group14-sha1"
#define KEX_DHGEX "diffie-hellman-group-exchange-sha1"
enum kex_init_proposals {
};
enum kex_exchange {
- DH_GRP1_SHA1,
- DH_GEX_SHA1
+ KEX_DH_GRP1_SHA1,
+ KEX_DH_GRP14_SHA1,
+ KEX_DH_GEX_SHA1,
+ KEX_MAX
};
#define KEX_INIT_SENT 0x0001
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;
+ const EVP_MD *md;
int mac_len;
u_char *key;
int key_len;
};
struct Kex {
u_char *session_id;
- int session_id_len;
+ u_int session_id_len;
Newkeys *newkeys[MODE_MAX];
int we_need;
int server;
int flags;
char *client_version_string;
char *server_version_string;
- int (*verify_host_key)(Key *hostkey);
- Key *(*load_host_key)(int type);
+ 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[PROPOSAL_MAX]);
-void kex_finish(Kex *kex);
+Kex *kex_setup(char *[PROPOSAL_MAX]);
+void kex_finish(Kex *);
-void kex_send_kexinit(Kex *kex);
-void kex_input_kexinit(int type, int plen, void *ctxt);
-void kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
+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);
-Newkeys *kex_get_newkeys(int mode);
+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 *);
+
+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 *msg, u_char *digest, int len);
+void dump_digest(char *, u_char *, int);
#endif
#endif