diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-05-29 03:14:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-05-29 13:28:47 +1000 |
commit | 4c607244054a036ad3b2449a6cb4c15feb846a76 (patch) | |
tree | 878a97f1159245a65447228bfea03901d7691503 | |
parent | 224418cf55611869a4ace1b8b07bba0dff77a9c3 (diff) |
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.c | 5 |
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 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11.c,v 1.49 2020/03/13 04:16:27 djm Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11.c,v 1.50 2020/05/29 03:14:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. | 4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. |
@@ -1859,7 +1859,8 @@ pkcs11_init(int interactive) | |||
1859 | } | 1859 | } |
1860 | 1860 | ||
1861 | int | 1861 | int |
1862 | pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp) | 1862 | pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp, |
1863 | char ***labelsp) | ||
1863 | { | 1864 | { |
1864 | error("%s: dlopen() not supported", __func__); | 1865 | error("%s: dlopen() not supported", __func__); |
1865 | return (-1); | 1866 | return (-1); |