tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2010/06/30 07:24:25 

[ssh-keygen.1]
     tweak previous;
This commit is contained in:
Damien Miller 2010-07-02 13:35:34 +10:00
parent 6018a36864
commit ea72728ffe
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -14,6 +14,9 @@
[auth2-pubkey.c sshd_config.5] [auth2-pubkey.c sshd_config.5]
allow key options (command="..." and friends) in AuthorizedPrincipals; allow key options (command="..." and friends) in AuthorizedPrincipals;
ok markus@ ok markus@
- jmc@cvs.openbsd.org 2010/06/30 07:24:25
[ssh-keygen.1]
tweak previous;
20100627 20100627
- (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs

16
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.95 2010/06/29 23:15:30 djm Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.96 2010/06/30 07:24:25 jmc Exp $
.\" .\"
.\" -*- nroff -*- .\" -*- nroff -*-
.\" .\"
@ -37,7 +37,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.
.\" .\"
.Dd $Mdocdate: June 29 2010 $ .Dd $Mdocdate: June 30 2010 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -222,7 +222,7 @@ print to stdout the key in one of the formats specified by the
option. option.
The default export format is The default export format is
.Dq RFC4716 . .Dq RFC4716 .
This option allows exporting OpenSSH key for use by other programs, including This option allows exporting OpenSSH keys for use by other programs, including
several commercial SSH implementations. several commercial SSH implementations.
.It Fl F Ar hostname .It Fl F Ar hostname
Search for the specified Search for the specified
@ -293,15 +293,18 @@ tries to find the matching public key file and prints its fingerprint.
If combined with If combined with
.Fl v , .Fl v ,
an ASCII art representation of the key is supplied with the fingerprint. an ASCII art representation of the key is supplied with the fingerprint.
.It Fl M Ar memory
Specify the amount of memory to use (in megabytes) when generating
candidate moduli for DH-GEX.
.It Fl m Ar key_format .It Fl m Ar key_format
Specify a key format for the Specify a key format for the
.Fl i .Fl i
(import) or (import) or
.Fl e .Fl e
(export) coversion options. (export) conversion options.
The supported key formats are: The supported key formats are:
.Dq RFC4716 .Dq RFC4716
(RFC4716/SSH2 public or private key), (RFC 4716/SSH2 public or private key),
.Dq PKCS8 .Dq PKCS8
(PEM PKCS8 public key) (PEM PKCS8 public key)
or or
@ -309,9 +312,6 @@ or
(PEM public key). (PEM public key).
The default conversion format is The default conversion format is
.Dq RFC4716 . .Dq RFC4716 .
.It Fl M Ar memory
Specify the amount of memory to use (in megabytes) when generating
candidate moduli for DH-GEX.
.It Fl N Ar new_passphrase .It Fl N Ar new_passphrase
Provides the new passphrase. Provides the new passphrase.
.It Fl n Ar principals .It Fl n Ar principals