mirror of git://anongit.mindrot.org/openssh.git
- jmc@cvs.openbsd.org 2010/02/08 22:03:05
[ssh-add.1 ssh-keygen.1 ssh.1 ssh.c] tweak previous; ok markus
This commit is contained in:
parent
7ea845e48d
commit
048dc93617
|
@ -15,6 +15,9 @@
|
|||
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
|
||||
- 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
|
||||
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" $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 -*-
|
||||
.\"
|
||||
|
@ -49,9 +49,9 @@
|
|||
.Op Fl t Ar life
|
||||
.Op Ar
|
||||
.Nm ssh-add
|
||||
.Fl s Ar reader
|
||||
.Fl s Ar pkcs11
|
||||
.Nm ssh-add
|
||||
.Fl e Ar reader
|
||||
.Fl e Ar pkcs11
|
||||
.Sh DESCRIPTION
|
||||
.Nm
|
||||
adds RSA or DSA identities to the authentication agent,
|
||||
|
@ -110,7 +110,7 @@ by the agent.
|
|||
.It Fl l
|
||||
Lists fingerprints of all identities currently represented by the agent.
|
||||
.It Fl s Ar pkcs11
|
||||
Add key provider by
|
||||
Add key provided by
|
||||
.Ar pkcs11 .
|
||||
.It Fl t Ar life
|
||||
Set a maximum lifetime when adding identities to an agent.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" $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 -*-
|
||||
.\"
|
||||
|
@ -79,7 +79,7 @@
|
|||
.Fl B
|
||||
.Op Fl f Ar input_keyfile
|
||||
.Nm ssh-keygen
|
||||
.Fl D Ar reader
|
||||
.Fl D Ar pkcs11
|
||||
.Nm ssh-keygen
|
||||
.Fl F Ar hostname
|
||||
.Op Fl f Ar known_hosts_file
|
||||
|
@ -91,9 +91,6 @@
|
|||
.Fl R Ar hostname
|
||||
.Op Fl f Ar known_hosts_file
|
||||
.Nm ssh-keygen
|
||||
.Fl U Ar reader
|
||||
.Op Fl f Ar input_keyfile
|
||||
.Nm ssh-keygen
|
||||
.Fl r Ar hostname
|
||||
.Op Fl f Ar input_keyfile
|
||||
.Op Fl g
|
||||
|
|
3
ssh.1
3
ssh.1
|
@ -34,7 +34,7 @@
|
|||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
.\" 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 $
|
||||
.Dt SSH 1
|
||||
.Os
|
||||
|
@ -54,6 +54,7 @@
|
|||
.Oc
|
||||
.Op Fl e Ar escape_char
|
||||
.Op Fl F Ar configfile
|
||||
.Op Fl I Ar pkcs11
|
||||
.Bk -words
|
||||
.Op Fl i Ar identity_file
|
||||
.Ek
|
||||
|
|
5
ssh.c
5
ssh.c
|
@ -1,4 +1,4 @@
|
|||
/* $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>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
|
@ -187,7 +187,8 @@ usage(void)
|
|||
fprintf(stderr,
|
||||
"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\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"
|
||||
" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n"
|
||||
" [-W host:port] [-w local_tun[:remote_tun]]\n"
|
||||
|
|
Loading…
Reference in New Issue