summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-10-20 14:12:31 +0100
committerColin Watson <cjwatson@debian.org>2020-10-20 14:12:31 +0100
commite371906fbbbbc11b0dced8fd4e0d258eb489d7c1 (patch)
tree4d0d8d2afd52572deb7910e29ff5a334b2bcf702 /ssh-pkcs11.c
parente429009cde648a41479cd1b60ce972760a2bdabc (diff)
parent3728919292c05983372954d27426f7d966813139 (diff)
New upstream release (8.4p1)
Diffstat (limited to 'ssh-pkcs11.c')
-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 @@
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
1861int 1861int
1862pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp) 1862pkcs11_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);