]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Revert "check_sk_options: add temporary WinHello workaround"
authorCorinna Vinschen <vinschen@redhat.com>
Thu, 11 Aug 2022 18:19:35 +0000 (20:19 +0200)
committerDamien Miller <djm@mindrot.org>
Fri, 12 Aug 2022 05:34:47 +0000 (15:34 +1000)
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>
sk-usbhid.c

index 74df16ed0c141c2b8cbc0aa48756d33cb60f0a29..02cefb87a247555c9eeb9e7f72277fce76c875ed 100644 (file)
@@ -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;