[openssh-commits] [openssh] 03/05: upstream: sk-usbhid: preserve error code returned by key_lookup()

[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 8638a2ce7e90c8a51d9af3143404282126c524f8
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed Jul 20 03:31:42 2022 +0000

    upstream: sk-usbhid: preserve error code returned by key_lookup()
    
    it conveys useful information, such as the supplied pin being wrong.
    
    Part of GHPR329 from Pedro Martelletto
    
    OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
---
 sk-usbhid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk-usbhid.c b/sk-usbhid.c
index d168cd03..616fc556 100644
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sk-usbhid.c,v 1.40 2022/07/20 03:29:14 djm Exp $ */
+/* $OpenBSD: sk-usbhid.c,v 1.41 2022/07/20 03:31:42 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl
  * Copyright (c) 2020 Pedro Martelletto
@@ -876,7 +876,7 @@ sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
 	    (r = key_lookup(sk->dev, application, user_id, sizeof(user_id),
 	    pin)) != FIDO_ERR_NO_CREDENTIALS) {
 		if (r != FIDO_OK) {
-			ret = SSH_SK_ERR_GENERAL;
+			ret = fidoerr_to_skerr(r);
 			skdebug(__func__, "key_lookup failed");
 		} else {
 			ret = SSH_SK_ERR_CREDENTIAL_EXISTS;

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