diff options
Diffstat (limited to 'kexgexc.c')
-rw-r--r-- | kexgexc.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexc.c,v 1.23 2016/09/12 01:22:38 deraadt Exp $ */ | 1 | /* $OpenBSD: kexgexc.c,v 1.24 2017/05/16 16:56:15 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. |
@@ -165,10 +165,6 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt) | |||
165 | (r = sshkey_from_blob(server_host_key_blob, sbloblen, | 165 | (r = sshkey_from_blob(server_host_key_blob, sbloblen, |
166 | &server_host_key)) != 0) | 166 | &server_host_key)) != 0) |
167 | goto out; | 167 | goto out; |
168 | if (server_host_key->type != kex->hostkey_type) { | ||
169 | r = SSH_ERR_KEY_TYPE_MISMATCH; | ||
170 | goto out; | ||
171 | } | ||
172 | if (server_host_key->type != kex->hostkey_type || | 168 | if (server_host_key->type != kex->hostkey_type || |
173 | (kex->hostkey_type == KEY_ECDSA && | 169 | (kex->hostkey_type == KEY_ECDSA && |
174 | server_host_key->ecdsa_nid != kex->hostkey_nid)) { | 170 | server_host_key->ecdsa_nid != kex->hostkey_nid)) { |