diff options
author | Damien Miller <djm@mindrot.org> | 2010-02-12 09:21:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-02-12 09:21:02 +1100 |
commit | 7ea845e48df6d34a333ebbe79380cba0938d02a5 (patch) | |
tree | 44ab0d3fdfe0560b7ca92f5747e9dd5d012aea18 /sftp.1 | |
parent | 17751bcab25681d341442fdc2386a30a6bea345e (diff) |
- markus@cvs.openbsd.org 2010/02/08 10:50:20
[pathnames.h readconf.c readconf.h scp.1 sftp.1 ssh-add.1 ssh-add.c]
[ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config.5]
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 'sftp.1')
-rw-r--r-- | sftp.1 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.82 2010/01/13 12:48:34 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.83 2010/02/08 10:50:20 markus Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: January 13 2010 $ | 25 | .Dd $Mdocdate: February 8 2010 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -202,6 +202,7 @@ For full details of the options listed below, and their possible values, see | |||
202 | .It NoHostAuthenticationForLocalhost | 202 | .It NoHostAuthenticationForLocalhost |
203 | .It NumberOfPasswordPrompts | 203 | .It NumberOfPasswordPrompts |
204 | .It PasswordAuthentication | 204 | .It PasswordAuthentication |
205 | .It PKCS11Provider | ||
205 | .It Port | 206 | .It Port |
206 | .It PreferredAuthentications | 207 | .It PreferredAuthentications |
207 | .It Protocol | 208 | .It Protocol |
@@ -213,7 +214,6 @@ For full details of the options listed below, and their possible values, see | |||
213 | .It SendEnv | 214 | .It SendEnv |
214 | .It ServerAliveInterval | 215 | .It ServerAliveInterval |
215 | .It ServerAliveCountMax | 216 | .It ServerAliveCountMax |
216 | .It SmartcardDevice | ||
217 | .It StrictHostKeyChecking | 217 | .It StrictHostKeyChecking |
218 | .It TCPKeepAlive | 218 | .It TCPKeepAlive |
219 | .It UsePrivilegedPort | 219 | .It UsePrivilegedPort |