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 /auth.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 'auth.h')
-rw-r--r-- | auth.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.80 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.81 2015/01/26 06:10:03 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -204,8 +204,8 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *, | |||
204 | /* hostkey handling */ | 204 | /* hostkey handling */ |
205 | Key *get_hostkey_by_index(int); | 205 | Key *get_hostkey_by_index(int); |
206 | Key *get_hostkey_public_by_index(int, struct ssh *); | 206 | Key *get_hostkey_public_by_index(int, struct ssh *); |
207 | Key *get_hostkey_public_by_type(int, struct ssh *); | 207 | Key *get_hostkey_public_by_type(int, int, struct ssh *); |
208 | Key *get_hostkey_private_by_type(int, struct ssh *); | 208 | Key *get_hostkey_private_by_type(int, int, struct ssh *); |
209 | int get_hostkey_index(Key *, struct ssh *); | 209 | int get_hostkey_index(Key *, struct ssh *); |
210 | int ssh1_session_key(BIGNUM *); | 210 | int ssh1_session_key(BIGNUM *); |
211 | int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *, u_char *, size_t, u_int); | 211 | int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *, u_char *, size_t, u_int); |