tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11 

OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923
This commit is contained in:
djm@openbsd.org 2024-03-06 00:31:04 +00:00 committed by Damien Miller
parent d52b650921
commit 242742827f
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.304 2023/12/18 15:58:56 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.305 2024/03/06 00:31:04 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -250,6 +250,7 @@ free_dest_constraints(struct dest_constraint *dcs, size_t ndcs)
free(dcs); free(dcs);
} }
#ifdef ENABLE_PKCS11
static void static void
dup_dest_constraint_hop(const struct dest_constraint_hop *dch, dup_dest_constraint_hop(const struct dest_constraint_hop *dch,
struct dest_constraint_hop *out) struct dest_constraint_hop *out)
@ -289,6 +290,7 @@ dup_dest_constraints(const struct dest_constraint *dcs, size_t ndcs)
} }
return ret; return ret;
} }
#endif /* ENABLE_PKCS11 */
#ifdef DEBUG_CONSTRAINTS #ifdef DEBUG_CONSTRAINTS
static void static void
@ -1522,6 +1524,7 @@ no_identities(SocketEntry *e)
sshbuf_free(msg); sshbuf_free(msg);
} }
#ifdef ENABLE_PKCS11
/* Add an identity to idlist; takes ownership of 'key' and 'comment' */ /* Add an identity to idlist; takes ownership of 'key' and 'comment' */
static void static void
add_p11_identity(struct sshkey *key, char *comment, const char *provider, add_p11_identity(struct sshkey *key, char *comment, const char *provider,
@ -1548,7 +1551,6 @@ add_p11_identity(struct sshkey *key, char *comment, const char *provider,
idtab->nentries++; idtab->nentries++;
} }
#ifdef ENABLE_PKCS11
static void static void
process_add_smartcard_key(SocketEntry *e) process_add_smartcard_key(SocketEntry *e)
{ {