tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/07 08:08:26

Browse Source 
[ssh-keygen.1]
     document -a and -o wrt new key format
This commit is contained in:
Damien Miller 2013-12-18 17:45:35 +11:00
parent 6d6fcd14e2
commit 4f752cf71c
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
20131218
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2013/12/07 08:08:26
[ssh-keygen.1]
document -a and -o wrt new key format
20131208 20131208
- (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
Vinschen Vinschen

31
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.116 2013/06/27 14:05:37 jmc Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.117 2013/12/07 08:08:26 djm 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
@ -35,7 +35,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 27 2013 $ .Dd $Mdocdate: December 7 2013 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -103,7 +103,7 @@
.Fl T Ar output_file .Fl T Ar output_file
.Fl f Ar input_file .Fl f Ar input_file
.Op Fl v .Op Fl v
.Op Fl a Ar num_trials .Op Fl a Ar rounds
.Op Fl J Ar num_lines .Op Fl J Ar num_lines
.Op Fl j Ar start_line .Op Fl j Ar start_line
.Op Fl K Ar checkpt .Op Fl K Ar checkpt
@ -222,11 +222,20 @@ an empty passphrase, default bits for the key type, and default comment.
This is used by This is used by
.Pa /etc/rc .Pa /etc/rc
to generate new host keys. to generate new host keys.
.It Fl a Ar trials .It Fl a Ar rounds
Specifies the number of primality tests to perform when screening DH-GEX When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
candidates using the 2 key when the
.Fl o
flag is set), this option specifies the number of KDF (key derivation function)
rounds used.
Higher numbers result in slower passphrase verification and increased
resistance to brute-force password cracking (should the keys be stolen).
.Pp
When screening DH-GEX candidates (
using the
.Fl T .Fl T
command. command).
This option specifies the number of primality tests to perform.
.It Fl B .It Fl B
Show the bubblebabble digest of specified private or public key file. Show the bubblebabble digest of specified private or public key file.
.It Fl b Ar bits .It Fl b Ar bits
@ -447,6 +456,14 @@ format.
.El .El
.Pp .Pp
At present, no options are valid for host keys. At present, no options are valid for host keys.
.It Fl o
Causes
.Nm
to save SSH protocol 2 private keys using the new OpenSSH format rather than
the more compatible PEM format.
The new format has increased resistance to brute-force password cracking
but is not supported by versions of OpenSSH prior to 6.5.
Ed25519 keys always use the new private key format.
.It Fl P Ar passphrase .It Fl P Ar passphrase
Provides the (old) passphrase. Provides the (old) passphrase.
.It Fl p .It Fl p