From 10f3402521b13274ea7704b69ddf3769d1cac8fc Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Tue, 7 Dec 2021 22:06:45 +0000
Subject: [PATCH] better error message for FIDO keys when we can't match them
 to a token

---
 usr.bin/ssh/sk-usbhid.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr.bin/ssh/sk-usbhid.c b/usr.bin/ssh/sk-usbhid.c
index 8deebf480fc..6d629da7792 100644
--- a/usr.bin/ssh/sk-usbhid.c
+++ b/usr.bin/ssh/sk-usbhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sk-usbhid.c,v 1.36 2021/12/02 23:23:13 djm Exp $ */
+/* $OpenBSD: sk-usbhid.c,v 1.37 2021/12/07 22:06:45 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl
  * Copyright (c) 2020 Pedro Martelletto
@@ -728,6 +728,7 @@ sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
 	else
 		sk = sk_probe(NULL, NULL, 0);
 	if (sk == NULL) {
+		ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
 		skdebug(__func__, "failed to find sk");
 		goto out;
 	}
@@ -1022,6 +1023,7 @@ sk_sign(uint32_t alg, const uint8_t *data, size_t datalen,
 	else
 		sk = sk_probe(application, key_handle, key_handle_len);
 	if (sk == NULL) {
+		ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
 		skdebug(__func__, "failed to find sk");
 		goto out;
 	}
@@ -1286,6 +1288,7 @@ sk_load_resident_keys(const char *pin, struct sk_option **options,
 	else
 		sk = sk_probe(NULL, NULL, 0);
 	if (sk == NULL) {
+		ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
 		skdebug(__func__, "failed to find sk");
 		goto out;
 	}
-- 
2.20.1