diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-01-26 06:10:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-27 00:00:57 +1100 |
| commit | 5104db7cbd6cdd9c5971f4358e74414862fc1022 (patch) | |
| tree | 94692c77a4888f8adade706324fdee3a999bc6b0 /kex.h | |
| parent | 8d4f87258f31cb6def9b3b55b6a7321d84728ff2 (diff) | |
| download | openssh-git-5104db7cbd6cdd9c5971f4358e74414862fc1022.tar.gz | |
upstream commit
correctly match ECDSA subtype (== curve) for
offered/recevied host keys. Fixes connection-killing host key mismatches when
a server offers multiple ECDSA keys with different curve type (an extremely
unlikely configuration).
ok markus, "looks mechanical" deraadt@
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.69 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: kex.h,v 1.70 2015/01/26 06:10:03 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -116,6 +116,7 @@ struct kex { int server; char *name; int hostkey_type; + int hostkey_nid; u_int kex_type; int roaming; struct sshbuf *my; @@ -127,8 +128,8 @@ struct kex { char *client_version_string; char *server_version_string; int (*verify_host_key)(struct sshkey *, struct ssh *); - struct sshkey *(*load_host_public_key)(int, struct ssh *); - struct sshkey *(*load_host_private_key)(int, struct ssh *); + struct sshkey *(*load_host_public_key)(int, int, struct ssh *); + struct sshkey *(*load_host_private_key)(int, int, struct ssh *); int (*host_key_index)(struct sshkey *, struct ssh *); int (*sign)(struct sshkey *, struct sshkey *, u_char **, size_t *, u_char *, size_t, u_int); |