summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index 7194b1453..ee468157c 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.71 2015/02/16 22:13:32 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.73 2015/07/30 00:01:34 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.
@@ -150,6 +150,7 @@ struct kex {
150#endif 150#endif
151 char *client_version_string; 151 char *client_version_string;
152 char *server_version_string; 152 char *server_version_string;
153 char *failed_choice;
153 int (*verify_host_key)(struct sshkey *, struct ssh *); 154 int (*verify_host_key)(struct sshkey *, struct ssh *);
154 struct sshkey *(*load_host_public_key)(int, int, struct ssh *); 155 struct sshkey *(*load_host_public_key)(int, int, struct ssh *);
155 struct sshkey *(*load_host_private_key)(int, int, struct ssh *); 156 struct sshkey *(*load_host_private_key)(int, int, struct ssh *);
@@ -168,6 +169,8 @@ struct kex {
168 169
169int kex_names_valid(const char *); 170int kex_names_valid(const char *);
170char *kex_alg_list(char); 171char *kex_alg_list(char);
172char *kex_names_cat(const char *, const char *);
173int kex_assemble_names(const char *, char **);
171 174
172int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **); 175int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **);
173int kex_setup(struct ssh *, char *[PROPOSAL_MAX]); 176int kex_setup(struct ssh *, char *[PROPOSAL_MAX]);