diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 23:13:09 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-26 10:18:42 +1100 |
| commit | 59d01f1d720ebede4da42882f592d1093dac7adc (patch) | |
| tree | d79871dcec88b95a6df86dd6821cbdf5e467f719 /ssh-sk.c | |
| parent | 99aa8035554ddb976348d2a9253ab3653019728d (diff) | |
| download | openssh-git-59d01f1d720ebede4da42882f592d1093dac7adc.tar.gz | |
upstream: improve the error message for u2f enrollment errors by
making ssh-keygen be solely responsible for printing the error message and
convertint some more common error responses from the middleware to a useful
ssherr.h status code. more detail remains visible via -v of course.
also remove indepedent copy of sk-api.h declarations in sk-usbhid.c
and just include it.
feedback & ok markus@
OpenBSD-Commit-ID: a4a8ffa870d9a3e0cfd76544bcdeef5c9fb1f1bb
Diffstat (limited to 'ssh-sk.c')
| -rw-r--r-- | ssh-sk.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-sk.c,v 1.24 2020/01/06 02:00:47 djm Exp $ */ +/* $OpenBSD: ssh-sk.c,v 1.25 2020/01/25 23:13:09 djm Exp $ */ /* * Copyright (c) 2019 Google LLC * @@ -338,6 +338,8 @@ skerr_to_ssherr(int skerr) return SSH_ERR_FEATURE_UNSUPPORTED; case SSH_SK_ERR_PIN_REQUIRED: return SSH_ERR_KEY_WRONG_PASSPHRASE; + case SSH_SK_ERR_DEVICE_NOT_FOUND: + return SSH_ERR_DEVICE_NOT_FOUND; case SSH_SK_ERR_GENERAL: default: return SSH_ERR_INVALID_FORMAT; @@ -490,7 +492,7 @@ sshsk_enroll(int type, const char *provider_path, const char *device, /* enroll key */ if ((r = skp->sk_enroll(alg, challenge, challenge_len, application, flags, pin, opts, &resp)) != 0) { - error("Security key provider \"%s\" returned failure %d", + debug("%s: provider \"%s\" returned failure %d", __func__, provider_path, r); r = skerr_to_ssherr(r); goto out; |