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 /kexecdhs.c | |
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 'kexecdhs.c')
-rw-r--r-- | kexecdhs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index f47a7b207..0adb80e6a 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.13 2015/01/20 07:55:33 djm Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.14 2015/01/26 06:10:03 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -95,8 +95,10 @@ input_kex_ecdh_init(int type, u_int32_t seq, void *ctxt) | |||
95 | r = SSH_ERR_INVALID_ARGUMENT; | 95 | r = SSH_ERR_INVALID_ARGUMENT; |
96 | goto out; | 96 | goto out; |
97 | } | 97 | } |
98 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); | 98 | server_host_public = kex->load_host_public_key(kex->hostkey_type, |
99 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); | 99 | kex->hostkey_nid, ssh); |
100 | server_host_private = kex->load_host_private_key(kex->hostkey_type, | ||
101 | kex->hostkey_nid, ssh); | ||
100 | if (server_host_public == NULL) { | 102 | if (server_host_public == NULL) { |
101 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 103 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
102 | goto out; | 104 | goto out; |