From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 28 Feb 2020 01:06:05 +0000 (+0000)
Subject: upstream: better error message when trying to use a FIDO key
X-Git-Tag: V_8_3_P1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd992520bed35387fc010239abe1bdc0c2665e38;p=thirdparty%2Fopenssh-portable.git

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 5ff938193..30225891d 100644
--- 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;