diff options
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.81 2016/09/28 21:44:52 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.83 2017/05/30 14:23:52 markus 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. |
@@ -181,8 +181,8 @@ int kex_prop2buf(struct sshbuf *, char *proposal[PROPOSAL_MAX]); | |||
181 | void kex_prop_free(char **); | 181 | void kex_prop_free(char **); |
182 | 182 | ||
183 | int kex_send_kexinit(struct ssh *); | 183 | int kex_send_kexinit(struct ssh *); |
184 | int kex_input_kexinit(int, u_int32_t, void *); | 184 | int kex_input_kexinit(int, u_int32_t, struct ssh *); |
185 | int kex_input_ext_info(int, u_int32_t, void *); | 185 | int kex_input_ext_info(int, u_int32_t, struct ssh *); |
186 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); | 186 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); |
187 | int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); | 187 | int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); |
188 | int kex_send_newkeys(struct ssh *); | 188 | int kex_send_newkeys(struct ssh *); |
@@ -225,9 +225,6 @@ int kexc25519_shared_key(const u_char key[CURVE25519_SIZE], | |||
225 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) | 225 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) |
226 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); | 226 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); |
227 | 227 | ||
228 | int | ||
229 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | ||
230 | |||
231 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) | 228 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) |
232 | void dump_digest(char *, u_char *, int); | 229 | void dump_digest(char *, u_char *, int); |
233 | #endif | 230 | #endif |