diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:05:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 21:47:28 +1100 |
commit | bb39bafb6dc520cc097780f4611a52da7f19c3e2 (patch) | |
tree | b5721488b62d4e8cc1ffa322ae659e5265a0c707 /kex.h | |
parent | dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc (diff) |
upstream: factor out kex_load_hostkey() - this is duplicated in
both the client and server implementations for most KEX methods.
from markus@ ok djm@
OpenBSD-Commit-ID: 8232fa7c21fbfbcaf838313b0c166dc6c8762f3c
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.96 2019/01/21 10:03:37 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.97 2019/01/21 10:05:09 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. |
@@ -184,6 +184,7 @@ void kex_free(struct kex *); | |||
184 | int kex_buf2prop(struct sshbuf *, int *, char ***); | 184 | int kex_buf2prop(struct sshbuf *, int *, char ***); |
185 | int kex_prop2buf(struct sshbuf *, char *proposal[PROPOSAL_MAX]); | 185 | int kex_prop2buf(struct sshbuf *, char *proposal[PROPOSAL_MAX]); |
186 | void kex_prop_free(char **); | 186 | void kex_prop_free(char **); |
187 | int kex_load_hostkey(struct ssh *, struct sshkey **, struct sshkey **); | ||
187 | 188 | ||
188 | int kex_send_kexinit(struct ssh *); | 189 | int kex_send_kexinit(struct ssh *); |
189 | int kex_input_kexinit(int, u_int32_t, struct ssh *); | 190 | int kex_input_kexinit(int, u_int32_t, struct ssh *); |