Commit 048dc936 authored by Damien Miller's avatar Damien Miller

- jmc@cvs.openbsd.org 2010/02/08 22:03:05

     [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c]
     tweak previous; ok markus
parent 7ea845e4
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
a forked a ssh-pkcs11-helper process. a forked a ssh-pkcs11-helper process.
PKCS#11 is currently a compile time option. PKCS#11 is currently a compile time option.
feedback and ok djm@; inspired by patches from Alon Bar-Lev feedback and ok djm@; inspired by patches from Alon Bar-Lev
- jmc@cvs.openbsd.org 2010/02/08 22:03:05
[ssh-add.1 ssh-keygen.1 ssh.1 ssh.c]
tweak previous; ok markus
20100210 20100210
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
......
.\" $OpenBSD: ssh-add.1,v 1.49 2010/02/08 10:50:20 markus Exp $ .\" $OpenBSD: ssh-add.1,v 1.50 2010/02/08 22:03:05 jmc Exp $
.\" .\"
.\" -*- nroff -*- .\" -*- nroff -*-
.\" .\"
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
.Op Fl t Ar life .Op Fl t Ar life
.Op Ar .Op Ar
.Nm ssh-add .Nm ssh-add
.Fl s Ar reader .Fl s Ar pkcs11
.Nm ssh-add .Nm ssh-add
.Fl e Ar reader .Fl e Ar pkcs11
.Sh DESCRIPTION .Sh DESCRIPTION
.Nm .Nm
adds RSA or DSA identities to the authentication agent, adds RSA or DSA identities to the authentication agent,
...@@ -110,7 +110,7 @@ by the agent. ...@@ -110,7 +110,7 @@ by the agent.
.It Fl l .It Fl l
Lists fingerprints of all identities currently represented by the agent. Lists fingerprints of all identities currently represented by the agent.
.It Fl s Ar pkcs11 .It Fl s Ar pkcs11
Add key provider by Add key provided by
.Ar pkcs11 . .Ar pkcs11 .
.It Fl t Ar life .It Fl t Ar life
Set a maximum lifetime when adding identities to an agent. Set a maximum lifetime when adding identities to an agent.
......
.\" $OpenBSD: ssh-keygen.1,v 1.81 2010/02/08 10:50:20 markus Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.82 2010/02/08 22:03:05 jmc Exp $
.\" .\"
.\" -*- nroff -*- .\" -*- nroff -*-
.\" .\"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
.Fl B .Fl B
.Op Fl f Ar input_keyfile .Op Fl f Ar input_keyfile
.Nm ssh-keygen .Nm ssh-keygen
.Fl D Ar reader .Fl D Ar pkcs11
.Nm ssh-keygen .Nm ssh-keygen
.Fl F Ar hostname .Fl F Ar hostname
.Op Fl f Ar known_hosts_file .Op Fl f Ar known_hosts_file
...@@ -91,9 +91,6 @@ ...@@ -91,9 +91,6 @@
.Fl R Ar hostname .Fl R Ar hostname
.Op Fl f Ar known_hosts_file .Op Fl f Ar known_hosts_file
.Nm ssh-keygen .Nm ssh-keygen
.Fl U Ar reader
.Op Fl f Ar input_keyfile
.Nm ssh-keygen
.Fl r Ar hostname .Fl r Ar hostname
.Op Fl f Ar input_keyfile .Op Fl f Ar input_keyfile
.Op Fl g .Op Fl g
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.291 2010/02/08 10:50:20 markus Exp $ .\" $OpenBSD: ssh.1,v 1.292 2010/02/08 22:03:05 jmc Exp $
.Dd $Mdocdate: February 8 2010 $ .Dd $Mdocdate: February 8 2010 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
.Oc .Oc
.Op Fl e Ar escape_char .Op Fl e Ar escape_char
.Op Fl F Ar configfile .Op Fl F Ar configfile
.Op Fl I Ar pkcs11
.Bk -words .Bk -words
.Op Fl i Ar identity_file .Op Fl i Ar identity_file
.Ek .Ek
......
/* $OpenBSD: ssh.c,v 1.333 2010/02/08 10:50:20 markus Exp $ */ /* $OpenBSD: ssh.c,v 1.334 2010/02/08 22:03:05 jmc Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
...@@ -187,7 +187,8 @@ usage(void) ...@@ -187,7 +187,8 @@ usage(void)
fprintf(stderr, fprintf(stderr,
"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" "usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n" " [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
" [-i identity_file] [-L [bind_address:]port:host:hostport]\n" " [-I pkcs11] [-i identity_file]\n"
" [-L [bind_address:]port:host:hostport]\n"
" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n"
" [-W host:port] [-w local_tun[:remote_tun]]\n" " [-W host:port] [-w local_tun[:remote_tun]]\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment