summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
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 fd56171d2..a708e4868 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.
@@ -190,8 +190,8 @@ int kex_prop2buf(struct sshbuf *, char *proposal[PROPOSAL_MAX]);
190void kex_prop_free(char **); 190void kex_prop_free(char **);
191 191
192int kex_send_kexinit(struct ssh *); 192int kex_send_kexinit(struct ssh *);
193int kex_input_kexinit(int, u_int32_t, void *); 193int kex_input_kexinit(int, u_int32_t, struct ssh *);
194int kex_input_ext_info(int, u_int32_t, void *); 194int kex_input_ext_info(int, u_int32_t, struct ssh *);
195int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *); 195int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *);
196int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *); 196int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *);
197int kex_send_newkeys(struct ssh *); 197int 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
242int
243derive_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)
246void dump_digest(char *, u_char *, int); 243void dump_digest(char *, u_char *, int);
247#endif 244#endif