diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-12-18 03:25:15 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-12-19 05:21:37 +0100 |
| commit | 04c7e28f83062dc42f2380d1bb3a6bf0190852c0 (patch) | |
| tree | bc2c59d39a33aba84e0576039474668ada2546d2 /kexecdhc.c | |
| parent | upstream commit (diff) | |
| download | openssh-04c7e28f83062dc42f2380d1bb3a6bf0190852c0.tar.xz openssh-04c7e28f83062dc42f2380d1bb3a6bf0190852c0.zip | |
upstream commit
pass negotiated signing algorithm though to
sshkey_verify() and check that the negotiated algorithm matches the type in
the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@
OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9
Diffstat (limited to 'kexecdhc.c')
| -rw-r--r-- | kexecdhc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kexecdhc.c b/kexecdhc.c index d8a8b660f..67669b3bf 100644 --- a/kexecdhc.c +++ b/kexecdhc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexecdhc.c,v 1.11 2017/05/30 14:23:52 markus Exp $ */ +/* $OpenBSD: kexecdhc.c,v 1.12 2017/12/18 02:25:15 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -188,7 +188,7 @@ input_kex_ecdh_reply(int type, u_int32_t seq, struct ssh *ssh) goto out; if ((r = sshkey_verify(server_host_key, signature, slen, hash, - hashlen, ssh->compat)) != 0) + hashlen, kex->hostkey_alg, ssh->compat)) != 0) goto out; /* save session id */ |