From: Corinna Vinschen <vinschen@redhat.com>
Date: Thu, 11 Aug 2022 18:19:35 +0000 (+0200)
Subject: Revert "check_sk_options: add temporary WinHello workaround"
X-Git-Tag: V_9_1_P1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cccb011e130cbbac538b1689d10e4a067298df8b;p=thirdparty%2Fopenssh-portable.git

Revert "check_sk_options: add temporary WinHello workaround"

Cygwin now comes with libfido2 1.11.0, so this workaround
isn't required anymore.

This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.

Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
---

diff --git a/sk-usbhid.c b/sk-usbhid.c
index 74df16ed0..02cefb87a 100644
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -450,15 +450,6 @@ check_sk_options(fido_dev_t *dev, const char *opt, int *ret)
 		skdebug(__func__, "device is not fido2");
 		return 0;
 	}
-	/*
-	 * Workaround required up to libfido2 1.10.0.  As soon as 1.11.0
-	 * is released and updated in the Cygwin release, we can drop this.
-	 */
-	if (fido_dev_is_winhello(dev) && strcmp (opt, "uv") == 0) {
-		skdebug(__func__, "device is winhello");
-		*ret = 1;
-		return 0;
-	}
 	if ((info = fido_cbor_info_new()) == NULL) {
 		skdebug(__func__, "fido_cbor_info_new failed");
 		return -1;