summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-12 09:26:02 +1100
committerDamien Miller <djm@mindrot.org>2010-02-12 09:26:02 +1100
commita76184445530cb13ded5827546756471d7d423e2 (patch)
treeab15565a7058b0fb21635acb9be621825cd0ad5f /ssh.1
parent47cf16b8df67ce02866eefbe855174fa7dfbd359 (diff)
- markus@cvs.openbsd.org 2010/02/10 23:20:38
[ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5] pkcs#11 is no longer optional; improve wording; ok jmc@
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.18
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh.1 b/ssh.1
index 4424e1f60..8fcc9b564 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.292 2010/02/08 22:03:05 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.293 2010/02/10 23:20:38 markus Exp $
38.Dd $Mdocdate: February 8 2010 $ 38.Dd $Mdocdate: February 10 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -288,10 +288,8 @@ Allows remote hosts to connect to local forwarded ports.
288.It Fl I Ar pkcs11 288.It Fl I Ar pkcs11
289Specify the PKCS#11 shared libarary 289Specify the PKCS#11 shared libarary
290.Nm 290.Nm
291should use to communicate with a PKCS#11 token used for storing the user's 291should use to communicate with a PKCS#11 token providing the user's
292private RSA key. 292private RSA key.
293This option is only available if support for PKCS#11
294is compiled in (default is no support).
295.It Fl i Ar identity_file 293.It Fl i Ar identity_file
296Selects a file from which the identity (private key) for 294Selects a file from which the identity (private key) for
297RSA or DSA authentication is read. 295RSA or DSA authentication is read.