upstream: Add new structure for signature options

This is populated during signature verification with additional fields
that are present in and covered by the signature. At the moment, it is
only used to record security key-specific options, especially the flags
field.

with and ok markus@

OpenBSD-Commit-ID: 338a1f0e04904008836130bedb9ece4faafd4e49

1 files changed, 3 insertions, 2 deletions

diff --git a/clientloop.c b/clientloop.c
index 068506210..880abfda2 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.328 2019/11/13 04:47:52 deraadt Exp $ */
+/* $OpenBSD: clientloop.c,v 1.329 2019/11/25 00:51:37 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2003,7 +2003,8 @@ client_global_hostkeys_private_confirm(struct ssh *ssh, int type,
                     sshkey_type_plain(ctx->keys[i]->type) == KEY_RSA;
                 if ((r = sshkey_verify(ctx->keys[i], sig, siglen,
                     sshbuf_ptr(signdata), sshbuf_len(signdata),
-                    use_kexsigtype ? ssh->kex->hostkey_alg : NULL, 0)) != 0) {
+                    use_kexsigtype ? ssh->kex->hostkey_alg : NULL, 0,
+                    NULL)) != 0) {
                         error("%s: server gave bad signature for %s key %zu",
                             __func__, sshkey_type(ctx->keys[i]), i);
                         goto out;