summaryrefslogtreecommitdiff
path: root/ssh-pkcs11-helper.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-04 11:23:58 +0100
commit62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch)
tree3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /ssh-pkcs11-helper.c
parent6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff)
parent66bf74a92131b7effe49fb0eefe5225151869dc5 (diff)
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'ssh-pkcs11-helper.c')
-rw-r--r--ssh-pkcs11-helper.c14
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
44struct pkcs11_keyinfo { 44struct 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;
60Buffer oqueue; 60Buffer oqueue;
61 61
62static void 62static void
63add_key(Key *k, char *name) 63add_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 */
90static Key * 90static struct sshkey *
91lookup_key(Key *k) 91lookup_key(struct sshkey *k)
92{ 92{
93 struct pkcs11_keyinfo *ki; 93 struct pkcs11_keyinfo *ki;
94 94
@@ -114,7 +114,7 @@ static void
114process_add(void) 114process_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);