1 files changed, 25 insertions, 6 deletions

diff --git a/kex.h b/kex.h
index d5046c627..8fbcb2b79 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.56 2013/07/19 07:37:48 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.61 2014/01/25 10:12:50 dtucker Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -43,6 +43,7 @@
 #define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
 #define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"
 #define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"
+#define KEX_CURVE25519_SHA256   "curve25519-sha256@libssh.org"
 
 #define COMP_NONE       0
 #define COMP_ZLIB       1
@@ -74,6 +75,7 @@ enum kex_exchange {
         KEX_DH_GEX_SHA1,
         KEX_DH_GEX_SHA256,
         KEX_ECDH_SHA2,
+        KEX_C25519_SHA256,
         KEX_GSS_GRP1_SHA1,
         KEX_GSS_GRP14_SHA1,
         KEX_GSS_GEX_SHA1,
@@ -125,6 +127,7 @@ struct Kex {
         u_int   session_id_len;
         Newkeys *newkeys[MODE_MAX];
         u_int   we_need;
+        u_int   dh_need;
         int     server;
         char    *name;
         int     hostkey_type;
@@ -134,7 +137,7 @@ struct Kex {
         Buffer  peer;
         sig_atomic_t done;
         int     flags;
-        const EVP_MD *evp_md;
+        int     hash_alg;
         int     ec_nid;
 #ifdef GSSAPI
         int     gss_deleg_creds;
@@ -153,14 +156,15 @@ struct Kex {
 };
 
 int      kex_names_valid(const char *);
-char    *kex_alg_list(void);
+char    *kex_alg_list(char);
 
 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 *);
+void     kex_derive_keys(Kex *, u_char *, u_int, const u_char *, u_int);
+void     kex_derive_keys_bn(Kex *, u_char *, u_int, const BIGNUM *);
 
 Newkeys *kex_get_newkeys(int);
 
@@ -170,6 +174,8 @@ void	 kexgex_client(Kex *);
 void     kexgex_server(Kex *);
 void     kexecdh_client(Kex *);
 void     kexecdh_server(Kex *);
+void     kexc25519_client(Kex *);
+void     kexc25519_server(Kex *);
 
 #ifdef GSSAPI
 void    kexgss_client(Kex *);
@@ -180,15 +186,28 @@ 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 *,
+kexgex_hash(int, char *, char *, char *, int, char *,
     int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
     BIGNUM *, BIGNUM *, u_char **, u_int *);
 #ifdef OPENSSL_HAS_ECC
 void
-kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,
+kex_ecdh_hash(int, const EC_GROUP *, char *, char *, char *, int,
     char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,
     const BIGNUM *, u_char **, u_int *);
 #endif
+void
+kex_c25519_hash(int, char *, char *, char *, int,
+    char *, int, u_char *, int, const u_char *, const u_char *,
+    const u_char *, u_int, u_char **, u_int *);
+
+#define CURVE25519_SIZE 32
+void    kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE])
+        __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
+        __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
+void kexc25519_shared_key(const u_char key[CURVE25519_SIZE],
+    const u_char pub[CURVE25519_SIZE], Buffer *out)
+        __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
+        __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
 
 void
 derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);