diff options
| author | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
| commit | 9b2207f86007504b58fbb42ce7f30946bbd50cea (patch) | |
| tree | c90d6531b4082060e49583793ca124b381f7ffd6 /crypto/openssh/kex.h | |
| parent | e86fa364ca07e2714edcfb3790ae4ea2b1d460c9 (diff) | |
| download | FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.zip FreeBSD-src-9b2207f86007504b58fbb42ce7f30946bbd50cea.tar.gz | |
Upgrade to OpenSSH 7.0p1.
Diffstat (limited to 'crypto/openssh/kex.h')
| -rw-r--r-- | crypto/openssh/kex.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssh/kex.h b/crypto/openssh/kex.h index f70b81f..d71b532 100644 --- a/crypto/openssh/kex.h +++ b/crypto/openssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.71 2015/02/16 22:13:32 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.73 2015/07/30 00:01:34 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -141,6 +141,7 @@ struct kex { int ec_nid; char *client_version_string; char *server_version_string; + char *failed_choice; int (*verify_host_key)(struct sshkey *, struct ssh *); struct sshkey *(*load_host_public_key)(int, int, struct ssh *); struct sshkey *(*load_host_private_key)(int, int, struct ssh *); @@ -159,6 +160,8 @@ struct kex { int kex_names_valid(const char *); char *kex_alg_list(char); +char *kex_names_cat(const char *, const char *); +int kex_assemble_names(const char *, char **); int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **); int kex_setup(struct ssh *, char *[PROPOSAL_MAX]); |
