diff options
Diffstat (limited to 'ssh-pkcs11-helper.c')
-rw-r--r-- | ssh-pkcs11-helper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index 53f41c555..fd3039c14 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11-helper.c,v 1.12 2016/02/15 09:47:49 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11-helper.c,v 1.13 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 | * |
@@ -42,7 +42,7 @@ | |||
42 | /* borrows code from sftp-server and ssh-agent */ | 42 | /* borrows code from sftp-server and ssh-agent */ |
43 | 43 | ||
44 | struct pkcs11_keyinfo { | 44 | struct pkcs11_keyinfo { |
45 | Key *key; | 45 | struct sshkey *key; |
46 | char *providername; | 46 | char *providername; |
47 | TAILQ_ENTRY(pkcs11_keyinfo) next; | 47 | TAILQ_ENTRY(pkcs11_keyinfo) next; |
48 | }; | 48 | }; |
@@ -60,7 +60,7 @@ Buffer iqueue; | |||
60 | Buffer oqueue; | 60 | Buffer oqueue; |
61 | 61 | ||
62 | static void | 62 | static void |
63 | add_key(Key *k, char *name) | 63 | add_key(struct sshkey *k, char *name) |
64 | { | 64 | { |
65 | struct pkcs11_keyinfo *ki; | 65 | struct pkcs11_keyinfo *ki; |
66 | 66 | ||
@@ -87,8 +87,8 @@ del_keys_by_name(char *name) | |||
87 | } | 87 | } |
88 | 88 | ||
89 | /* lookup matching 'private' key */ | 89 | /* lookup matching 'private' key */ |
90 | static Key * | 90 | static struct sshkey * |
91 | lookup_key(Key *k) | 91 | lookup_key(struct sshkey *k) |
92 | { | 92 | { |
93 | struct pkcs11_keyinfo *ki; | 93 | struct pkcs11_keyinfo *ki; |
94 | 94 | ||
@@ -114,7 +114,7 @@ static void | |||
114 | process_add(void) | 114 | process_add(void) |
115 | { | 115 | { |
116 | char *name, *pin; | 116 | char *name, *pin; |
117 | Key **keys; | 117 | struct sshkey **keys; |
118 | int i, nkeys; | 118 | int i, nkeys; |
119 | u_char *blob; | 119 | u_char *blob; |
120 | u_int blen; | 120 | u_int blen; |
@@ -170,7 +170,7 @@ process_sign(void) | |||
170 | u_char *blob, *data, *signature = NULL; | 170 | u_char *blob, *data, *signature = NULL; |
171 | u_int blen, dlen, slen = 0; | 171 | u_int blen, dlen, slen = 0; |
172 | int ok = -1; | 172 | int ok = -1; |
173 | Key *key, *found; | 173 | struct sshkey *key, *found; |
174 | Buffer msg; | 174 | Buffer msg; |
175 | 175 | ||
176 | blob = get_string(&blen); | 176 | blob = get_string(&blen); |