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, 1 deletions

diff --git a/sk-api.h b/sk-api.h
index 93d6a1229..170fd4470 100644
--- a/sk-api.h
+++ b/sk-api.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sk-api.h,v 1.7 2020/01/06 02:00:46 djm Exp $ */
+/* $OpenBSD: sk-api.h,v 1.8 2020/01/25 23:13:09 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -36,6 +36,7 @@
 #define SSH_SK_ERR_GENERAL              -1
 #define SSH_SK_ERR_UNSUPPORTED          -2
 #define SSH_SK_ERR_PIN_REQUIRED         -3
+#define SSH_SK_ERR_DEVICE_NOT_FOUND     -4
 
 struct sk_enroll_response {
         uint8_t *public_key;