summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:23:03 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:23:03 +1000
commit43b156cf72f900f88065b0a1c1ebd09ab733ca46 (patch)
tree09e222dc213179ed503976618a1f6e50b610636c /ssh-keygen.1
parentc1621c84f2dc1279065ab9fde2aa9327af418900 (diff)
- jmc@cvs.openbsd.org 2014/03/31 13:39:34
[ssh-keygen.1] the text for the -K option was inserted in the wrong place in -r1.108; fix From: Matthew Clarke
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.112
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 3f7341daa..723a0162e 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.121 2014/03/15 17:28:26 deraadt Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: March 15 2014 $ 38.Dd $Mdocdate: March 31 2014 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -332,6 +332,10 @@ in the format specified by the
332.Fl m 332.Fl m
333option and print an OpenSSH compatible private 333option and print an OpenSSH compatible private
334(or public) key to stdout. 334(or public) key to stdout.
335This option allows importing keys from other software, including several
336commercial SSH implementations.
337The default import format is
338.Dq RFC4716 .
335.It Fl J Ar num_lines 339.It Fl J Ar num_lines
336Exit after screening the specified number of lines 340Exit after screening the specified number of lines
337while performing DH candidate screening using the 341while performing DH candidate screening using the
@@ -350,10 +354,6 @@ while performing DH candidate screening using the
350option. 354option.
351This will be used to skip lines in the input file that have already been 355This will be used to skip lines in the input file that have already been
352processed if the job is restarted. 356processed if the job is restarted.
353This option allows importing keys from other software, including several
354commercial SSH implementations.
355The default import format is
356.Dq RFC4716 .
357.It Fl k 357.It Fl k
358Generate a KRL file. 358Generate a KRL file.
359In this mode, 359In this mode,