diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-25 01:03:36 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-25 01:35:55 +0100 |
| commit | 89a8d4525e8edd9958ed3df60cf683551142eae0 (patch) | |
| tree | 5251d0355691f30dca76d17724dd0d2123285e6e /ssh-pkcs11.h | |
| parent | upstream: tweak proctitle to include sshd arguments, as these are (diff) | |
| download | openssh-89a8d4525e8edd9958ed3df60cf683551142eae0.tar.xz openssh-89a8d4525e8edd9958ed3df60cf683551142eae0.zip | |
upstream: expose PKCS#11 key labels/X.509 subjects as comments
Extract the key label or X.509 subject string when PKCS#11 keys
are retrieved from the token and plumb this through to places where
it may be used as a comment.
based on https://github.com/openssh/openssh-portable/pull/138
by Danielle Church
feedback and ok markus@
OpenBSD-Commit-ID: cae1fda10d9e10971dea29520916e27cfec7ca35
Diffstat (limited to 'ssh-pkcs11.h')
| -rw-r--r-- | ssh-pkcs11.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11.h b/ssh-pkcs11.h index b9038450d..81f1d7c5d 100644 --- a/ssh-pkcs11.h +++ b/ssh-pkcs11.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.h,v 1.5 2019/01/20 22:51:37 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11.h,v 1.6 2020/01/25 00:03:36 djm Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -24,7 +24,7 @@ int pkcs11_init(int); void pkcs11_terminate(void); -int pkcs11_add_provider(char *, char *, struct sshkey ***); +int pkcs11_add_provider(char *, char *, struct sshkey ***, char ***); int pkcs11_del_provider(char *); #ifdef WITH_PKCS11_KEYGEN struct sshkey * |