upstream: better error message when trying to use a FIDO key

function and SecurityKeyProvider is empty

OpenBSD-Commit-ID: e56602c2ee8c82f835d30e4dc8ee2e4a7896be24

diff --git a/ssh-sk.c b/ssh-sk.c
index 5ff938193201c6b34fca28b5ca5d33ff5f91390d..30225891dcda4d2bcff9c703b171cce4f1862fef 100644 (file)
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk.c,v 1.27 2020/02/06 22:30:54 naddy Exp $ */
+/* $OpenBSD: ssh-sk.c,v 1.28 2020/02/28 01:06:05 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -100,6 +100,10 @@ sshsk_open(const char *path)
        struct sshsk_provider *ret = NULL;
        uint32_t version;
 
+       if (path == NULL || *path == '\0') {
+               error("No FIDO SecurityKeyProvider specified");
+               return NULL;
+       }
        if ((ret = calloc(1, sizeof(*ret))) == NULL) {
                error("%s: calloc failed", __func__);
                return NULL;