From: Damien Miller <djm@mindrot.org>
Date: Wed, 17 Aug 2022 06:04:16 +0000 (+1000)
Subject: on Cygwin, prefer WinHello FIDO device
X-Git-Tag: V_9_1_P1~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812;p=thirdparty%2Fopenssh-portable.git

on Cygwin, prefer WinHello FIDO device

If no FIDO device was explictly specified, then prefer the
windows://hello FIDO device. An exception to this is when
probing resident FIDO keys, in which case hardware FIDO
devices are preferred.
---

diff --git a/sk-usbhid.c b/sk-usbhid.c
index 1d0faebcf..8f8357332 100644
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -571,6 +571,10 @@ sk_probe(const char *application, const uint8_t *key_handle,
 	size_t ndevs;
 	int r;
 
+#ifdef HAVE_CYGWIN
+	if (!probe_resident && (sk = sk_open("windows://hello")) != NULL)
+		return sk;
+#endif /* HAVE_CYGWIN */
 	if ((devlist = fido_dev_info_new(MAX_FIDO_DEVICES)) == NULL) {
 		skdebug(__func__, "fido_dev_info_new failed");
 		return NULL;