===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-pkcs11-helper.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/ssh/ssh-pkcs11-helper.c	2016/02/15 09:47:49	1.12
+++ src/usr.bin/ssh/ssh-pkcs11-helper.c	2017/05/30 08:52:19	1.13
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11-helper.c,v 1.12 2016/02/15 09:47:49 dtucker Exp $ */
+/* $OpenBSD: ssh-pkcs11-helper.c,v 1.13 2017/05/30 08:52:19 markus Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  *
@@ -35,7 +35,7 @@
 /* borrows code from sftp-server and ssh-agent */
 
 struct pkcs11_keyinfo {
-	Key		*key;
+	struct sshkey	*key;
 	char		*providername;
 	TAILQ_ENTRY(pkcs11_keyinfo) next;
 };
@@ -53,7 +53,7 @@
 Buffer oqueue;
 
 static void
-add_key(Key *k, char *name)
+add_key(struct sshkey *k, char *name)
 {
 	struct pkcs11_keyinfo *ki;
 
@@ -80,8 +80,8 @@
 }
 
 /* lookup matching 'private' key */
-static Key *
-lookup_key(Key *k)
+static struct sshkey *
+lookup_key(struct sshkey *k)
 {
 	struct pkcs11_keyinfo *ki;
 
@@ -107,7 +107,7 @@
 process_add(void)
 {
 	char *name, *pin;
-	Key **keys;
+	struct sshkey **keys;
 	int i, nkeys;
 	u_char *blob;
 	u_int blen;
@@ -163,7 +163,7 @@
 	u_char *blob, *data, *signature = NULL;
 	u_int blen, dlen, slen = 0;
 	int ok = -1;
-	Key *key, *found;
+	struct sshkey *key, *found;
 	Buffer msg;
 
 	blob = get_string(&blen);