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

1 files changed, 3 insertions, 2 deletions

diff --git a/clientloop.c b/clientloop.c
index e3824ccd9..3ce5d930e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.307 2017/11/25 05:58:47 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.308 2017/12/18 02:25:15 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1934,7 +1934,8 @@ client_global_hostkeys_private_confirm(struct ssh *ssh, int type,
                         goto out;
                 }
                 if ((r = sshkey_verify(ctx->keys[i], sig, siglen,
-                    sshbuf_ptr(signdata), sshbuf_len(signdata), 0)) != 0) {
+                    sshbuf_ptr(signdata), sshbuf_len(signdata),
+                    ssh->kex->hostkey_alg, 0)) != 0) {
                         error("%s: server gave bad signature for %s key %zu",
                             __func__, sshkey_type(ctx->keys[i]), i);
                         goto out;