summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-05-29 05:14:02 +0200
committerDamien Miller <djm@mindrot.org>2020-05-29 05:28:47 +0200
commit4c607244054a036ad3b2449a6cb4c15feb846a76 (patch)
tree878a97f1159245a65447228bfea03901d7691503
parentupstream: fix exit status for downloading of FIDO resident keys; (diff)
downloadopenssh-4c607244054a036ad3b2449a6cb4c15feb846a76.tar.xz
openssh-4c607244054a036ad3b2449a6cb4c15feb846a76.zip
upstream: fix compilation on !HAVE_DLOPEN platforms; stub function
was not updated to match API change. From Dale Rahn via beck@ ok markus@ OpenBSD-Commit-ID: 2b8d054afe34c9ac85e417dae702ef981917b836
-rw-r--r--ssh-pkcs11.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index ec0e91865..f495883d1 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.49 2020/03/13 04:16:27 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.50 2020/05/29 03:14:02 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -1859,7 +1859,8 @@ pkcs11_init(int interactive)
}
int
-pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
+pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp,
+ char ***labelsp)
{
error("%s: dlopen() not supported", __func__);
return (-1);