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-helper.c | |
parent | 99aa8035554ddb976348d2a9253ab3653019728d (diff) |
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-helper.c')
-rw-r--r-- | ssh-sk-helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c index a4be9d369..2f93ad716 100644 --- a/ssh-sk-helper.c +++ b/ssh-sk-helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-sk-helper.c,v 1.8 2020/01/10 23:43:26 djm Exp $ */ | 1 | /* $OpenBSD: ssh-sk-helper.c,v 1.9 2020/01/25 23:13:09 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Google LLC | 3 | * Copyright (c) 2019 Google LLC |
4 | * | 4 | * |
@@ -63,7 +63,7 @@ reply_error(int r, char *fmt, ...) | |||
63 | va_start(ap, fmt); | 63 | va_start(ap, fmt); |
64 | xvasprintf(&msg, fmt, ap); | 64 | xvasprintf(&msg, fmt, ap); |
65 | va_end(ap); | 65 | va_end(ap); |
66 | error("%s: %s", __progname, msg); | 66 | debug("%s: %s", __progname, msg); |
67 | free(msg); | 67 | free(msg); |
68 | 68 | ||
69 | if (r >= 0) | 69 | if (r >= 0) |