summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
commit62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch)
tree3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /kex.h
parent6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff)
parent66bf74a92131b7effe49fb0eefe5225151869dc5 (diff)
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/kex.h b/kex.h
index 3794f2127..01bb3986a 100644
--- a/kex.h
+++ b/kex.h
@@ -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]);
181void kex_prop_free(char **); 181void kex_prop_free(char **);
182 182
183int kex_send_kexinit(struct ssh *); 183int kex_send_kexinit(struct ssh *);
184int kex_input_kexinit(int, u_int32_t, void *); 184int kex_input_kexinit(int, u_int32_t, struct ssh *);
185int kex_input_ext_info(int, u_int32_t, void *); 185int kex_input_ext_info(int, u_int32_t, struct ssh *);
186int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); 186int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *);
187int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); 187int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *);
188int kex_send_newkeys(struct ssh *); 188int 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
228int
229derive_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)
232void dump_digest(char *, u_char *, int); 229void dump_digest(char *, u_char *, int);
233#endif 230#endif