diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-05 23:58:12 +0100 |
commit | 0556ea972b15607b7e13ff31bc05840881c91dd3 (patch) | |
tree | d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /kex.h | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
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. |
@@ -190,8 +190,8 @@ int kex_prop2buf(struct sshbuf *, char *proposal[PROPOSAL_MAX]); | |||
190 | void kex_prop_free(char **); | 190 | void kex_prop_free(char **); |
191 | 191 | ||
192 | int kex_send_kexinit(struct ssh *); | 192 | int kex_send_kexinit(struct ssh *); |
193 | int kex_input_kexinit(int, u_int32_t, void *); | 193 | int kex_input_kexinit(int, u_int32_t, struct ssh *); |
194 | int kex_input_ext_info(int, u_int32_t, void *); | 194 | int kex_input_ext_info(int, u_int32_t, struct ssh *); |
195 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); | 195 | int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); |
196 | int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); | 196 | int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); |
197 | int kex_send_newkeys(struct ssh *); | 197 | int kex_send_newkeys(struct ssh *); |
@@ -239,9 +239,6 @@ int kexc25519_shared_key(const u_char key[CURVE25519_SIZE], | |||
239 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) | 239 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) |
240 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); | 240 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); |
241 | 241 | ||
242 | int | ||
243 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | ||
244 | |||
245 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) | 242 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH) |
246 | void dump_digest(char *, u_char *, int); | 243 | void dump_digest(char *, u_char *, int); |
247 | #endif | 244 | #endif |