upstream commit
switch from Key typedef with struct sshkey; ok djm@
Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 53f41c5..fd3039c 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -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.
*
@@ -42,7 +42,7 @@
/* borrows code from sftp-server and ssh-agent */
struct pkcs11_keyinfo {
- Key *key;
+ struct sshkey *key;
char *providername;
TAILQ_ENTRY(pkcs11_keyinfo) next;
};
@@ -60,7 +60,7 @@
Buffer oqueue;
static void
-add_key(Key *k, char *name)
+add_key(struct sshkey *k, char *name)
{
struct pkcs11_keyinfo *ki;
@@ -87,8 +87,8 @@
}
/* lookup matching 'private' key */
-static Key *
-lookup_key(Key *k)
+static struct sshkey *
+lookup_key(struct sshkey *k)
{
struct pkcs11_keyinfo *ki;
@@ -114,7 +114,7 @@
process_add(void)
{
char *name, *pin;
- Key **keys;
+ struct sshkey **keys;
int i, nkeys;
u_char *blob;
u_int blen;
@@ -170,7 +170,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);