diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2010-02-08 10:50:21 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2010-02-08 10:50:21 +0000 |
| commit | c5a426e3369a8674495c660c39ebd5bffb764a6f (patch) | |
| tree | f5067e4cadefe54001a450458ba0d8512c2fc051 /usr.bin/ssh/readconf.h | |
| parent | 22e0496c0669a0c8e5b32bc387471ba9b089448b (diff) | |
replace our obsolete smartcard code with PKCS#11.
ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf
ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11
provider (shared library) while ssh-agent(1) delegates PKCS#11 to
a forked a ssh-pkcs11-helper process.
PKCS#11 is currently a compile time option.
feedback and ok djm@; inspired by patches from Alon Bar-Lev
Diffstat (limited to 'usr.bin/ssh/readconf.h')
| -rw-r--r-- | usr.bin/ssh/readconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h index f7c0b9c6d13..4264751c516 100644 --- a/usr.bin/ssh/readconf.h +++ b/usr.bin/ssh/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.81 2010/01/09 23:04:13 dtucker Exp $ */ +/* $OpenBSD: readconf.h,v 1.82 2010/02/08 10:50:20 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -84,7 +84,7 @@ typedef struct { char *user_hostfile2; char *preferred_authentications; char *bind_address; /* local socket address for connection to sshd */ - char *smartcard_device; /* Smartcard reader device */ + char *pkcs11_provider; /* PKCS#11 provider */ int verify_host_key_dns; /* Verify host key using DNS */ int num_identity_files; /* Number of files for RSA/DSA identities. */ |