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

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 29013a20f..8df55f2c2 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.393 2020/01/25 23:02:13 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.394 2020/01/25 23:13:09 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3579,7 +3579,7 @@ main(int argc, char **argv)
                         if (r == 0)
                                 break;
                         if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)
-                                exit(1); /* error message already printed */
+                                fatal("Key enrollment failed: %s", ssh_err(r));
                         if (passphrase != NULL)
                                 freezero(passphrase, strlen(passphrase));
                         passphrase = read_passphrase("Enter PIN for security "