summaryrefslogtreecommitdiff
path: root/ssh-pkcs11-client.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-05 23:58:12 +0100
commit0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
treed6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /ssh-pkcs11-client.c
parentdb2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
New upstream release (7.6p1)
Diffstat (limited to 'ssh-pkcs11-client.c')
-rw-r--r--ssh-pkcs11-client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index fac0167e6..a79c87210 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11-client.c,v 1.6 2015/12/11 00:20:04 mmcc Exp $ */ 1/* $OpenBSD: ssh-pkcs11-client.c,v 1.7 2017/05/30 08:52:19 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -106,7 +106,7 @@ static int
106pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa, 106pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,
107 int padding) 107 int padding)
108{ 108{
109 Key key; 109 struct sshkey key; /* XXX */
110 u_char *blob, *signature = NULL; 110 u_char *blob, *signature = NULL;
111 u_int blen, slen = 0; 111 u_int blen, slen = 0;
112 int ret = -1; 112 int ret = -1;
@@ -186,7 +186,7 @@ pkcs11_start_helper(void)
186int 186int
187pkcs11_add_provider(char *name, char *pin, Key ***keysp) 187pkcs11_add_provider(char *name, char *pin, Key ***keysp)
188{ 188{
189 Key *k; 189 struct sshkey *k;
190 int i, nkeys; 190 int i, nkeys;
191 u_char *blob; 191 u_char *blob;
192 u_int blen; 192 u_int blen;