From 7ea845e48df6d34a333ebbe79380cba0938d02a5 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 12 Feb 2010 09:21:02 +1100
Subject:    - 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 `

---
 scp.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scp.1')

diff --git a/scp.1 b/scp.1
index 74ee5db13..bc5e259f5 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.49 2010/01/09 23:04:13 dtucker Exp $
+.\" $OpenBSD: scp.1,v 1.50 2010/02/08 10:50:20 markus Exp $
 .\"
-.Dd $Mdocdate: January 9 2010 $
+.Dd $Mdocdate: February 8 2010 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -153,6 +153,7 @@ For full details of the options listed below, and their possible values, see
 .It NoHostAuthenticationForLocalhost
 .It NumberOfPasswordPrompts
 .It PasswordAuthentication
+.It PKCS11Provider
 .It Port
 .It PreferredAuthentications
 .It Protocol
@@ -164,7 +165,6 @@ For full details of the options listed below, and their possible values, see
 .It SendEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
-.It SmartcardDevice
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UsePrivilegedPort
-- 
cgit v1.2.3