diff options
Diffstat (limited to 'kexgexc.c')
-rw-r--r-- | kexgexc.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexc.c,v 1.19 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexgexc.c,v 1.20 2015/01/26 06:10:03 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -176,6 +176,12 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) | |||
176 | r = SSH_ERR_KEY_TYPE_MISMATCH; | 176 | r = SSH_ERR_KEY_TYPE_MISMATCH; |
177 | goto out; | 177 | goto out; |
178 | } | 178 | } |
179 | if (server_host_key->type != kex->hostkey_type || | ||
180 | (kex->hostkey_type == KEY_ECDSA && | ||
181 | server_host_key->ecdsa_nid != kex->hostkey_nid)) { | ||
182 | r = SSH_ERR_KEY_TYPE_MISMATCH; | ||
183 | goto out; | ||
184 | } | ||
179 | if (kex->verify_host_key(server_host_key, ssh) == -1) { | 185 | if (kex->verify_host_key(server_host_key, ssh) == -1) { |
180 | r = SSH_ERR_SIGNATURE_INVALID; | 186 | r = SSH_ERR_SIGNATURE_INVALID; |
181 | goto out; | 187 | goto out; |