From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 2 Nov 2021 22:57:27 +0000 (+0000)
Subject: upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
X-Git-Tag: V_8_9_P1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed45a0168638319e0a710633f6085b96b9cec656;p=thirdparty%2Fopenssh-portable.git

upstream: crank SSH_SK_VERSION_MAJOR to match recent change in

usr/bin/ssh

OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
---

diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c
index d2b3ed43e..a10c0be28 100644
--- a/regress/misc/sk-dummy/sk-dummy.c
+++ b/regress/misc/sk-dummy/sk-dummy.c
@@ -59,7 +59,7 @@
 
 /* #define SK_DEBUG 1 */
 
-#if SSH_SK_VERSION_MAJOR != 0x00080000
+#if SSH_SK_VERSION_MAJOR != 0x00090000
 # error SK API has changed, sk-dummy.c needs an update
 #endif
 
@@ -260,6 +260,7 @@ sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
 		skdebug(__func__, "calloc response failed");
 		goto out;
 	}
+	response->flags = flags;
 	switch(alg) {
 	case SSH_SK_ECDSA:
 		if (pack_key_ecdsa(response) != 0)