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) |
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 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.69 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.70 2015/01/26 06:10:03 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. |
@@ -116,6 +116,7 @@ struct kex { | |||
116 | int server; | 116 | int server; |
117 | char *name; | 117 | char *name; |
118 | int hostkey_type; | 118 | int hostkey_type; |
119 | int hostkey_nid; | ||
119 | u_int kex_type; | 120 | u_int kex_type; |
120 | int roaming; | 121 | int roaming; |
121 | struct sshbuf *my; | 122 | struct sshbuf *my; |
@@ -127,8 +128,8 @@ struct kex { | |||
127 | char *client_version_string; | 128 | char *client_version_string; |
128 | char *server_version_string; | 129 | char *server_version_string; |
129 | int (*verify_host_key)(struct sshkey *, struct ssh *); | 130 | int (*verify_host_key)(struct sshkey *, struct ssh *); |
130 | struct sshkey *(*load_host_public_key)(int, struct ssh *); | 131 | struct sshkey *(*load_host_public_key)(int, int, struct ssh *); |
131 | struct sshkey *(*load_host_private_key)(int, struct ssh *); | 132 | struct sshkey *(*load_host_private_key)(int, int, struct ssh *); |
132 | int (*host_key_index)(struct sshkey *, struct ssh *); | 133 | int (*host_key_index)(struct sshkey *, struct ssh *); |
133 | int (*sign)(struct sshkey *, struct sshkey *, | 134 | int (*sign)(struct sshkey *, struct sshkey *, |
134 | u_char **, size_t *, u_char *, size_t, u_int); | 135 | u_char **, size_t *, u_char *, size_t, u_int); |