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 /kexc25519s.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 'kexc25519s.c')
-rw-r--r-- | kexc25519s.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kexc25519s.c b/kexc25519s.c index d840856d2..b2d2c858f 100644 --- a/kexc25519s.c +++ b/kexc25519s.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexc25519s.c,v 1.7 2015/01/20 07:55:33 djm Exp $ */ | 1 | /* $OpenBSD: kexc25519s.c,v 1.8 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. |
@@ -75,8 +75,10 @@ input_kex_c25519_init(int type, u_int32_t seq, void *ctxt) | |||
75 | r = SSH_ERR_INVALID_ARGUMENT; | 75 | r = SSH_ERR_INVALID_ARGUMENT; |
76 | goto out; | 76 | goto out; |
77 | } | 77 | } |
78 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); | 78 | server_host_public = kex->load_host_public_key(kex->hostkey_type, |
79 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); | 79 | kex->hostkey_nid, ssh); |
80 | server_host_private = kex->load_host_private_key(kex->hostkey_type, | ||
81 | kex->hostkey_nid, ssh); | ||
80 | if (server_host_public == NULL) { | 82 | if (server_host_public == NULL) { |
81 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 83 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
82 | goto out; | 84 | goto out; |