[openssh-commits] [openssh] 01/17: upstream: better error message for FIDO keys when we can't match

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 26ca33d186473d58a32d812e19273ce078b6ffff
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Dec 7 22:06:45 2021 +0000

    upstream: better error message for FIDO keys when we can't match
    
    them to a token
    
    OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650
---
 sk-usbhid.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sk-usbhid.c b/sk-usbhid.c
index 331b93b3..7e4d1d55 100644
--- a/sk-usbhid.c
+++ b/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
@@ -771,6 +771,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;
 	}
@@ -1072,6 +1073,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;
 	}
@@ -1336,6 +1338,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;
 	}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.