summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/kex.h b/kex.h
index 800a69233..fbe4940e8 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.58 2013/11/07 11:58:27 dtucker Exp $ */ 1/* $OpenBSD: kex.h,v 1.59 2014/01/09 23:20:00 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -133,7 +133,7 @@ struct Kex {
133 Buffer peer; 133 Buffer peer;
134 sig_atomic_t done; 134 sig_atomic_t done;
135 int flags; 135 int flags;
136 const EVP_MD *evp_md; 136 int hash_alg;
137 int ec_nid; 137 int ec_nid;
138 char *client_version_string; 138 char *client_version_string;
139 char *server_version_string; 139 char *server_version_string;
@@ -170,17 +170,17 @@ void
170kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, 170kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
171 BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); 171 BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
172void 172void
173kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, 173kexgex_hash(int, char *, char *, char *, int, char *,
174 int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, 174 int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
175 BIGNUM *, BIGNUM *, u_char **, u_int *); 175 BIGNUM *, BIGNUM *, u_char **, u_int *);
176#ifdef OPENSSL_HAS_ECC 176#ifdef OPENSSL_HAS_ECC
177void 177void
178kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int, 178kex_ecdh_hash(int, const EC_GROUP *, char *, char *, char *, int,
179 char *, int, u_char *, int, const EC_POINT *, const EC_POINT *, 179 char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,
180 const BIGNUM *, u_char **, u_int *); 180 const BIGNUM *, u_char **, u_int *);
181#endif 181#endif
182void 182void
183kex_c25519_hash(const EVP_MD *, char *, char *, char *, int, 183kex_c25519_hash(int, char *, char *, char *, int,
184 char *, int, u_char *, int, const u_char *, const u_char *, 184 char *, int, u_char *, int, const u_char *, const u_char *,
185 const BIGNUM *, u_char **, u_int *); 185 const BIGNUM *, u_char **, u_int *);
186 186