summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-09-06 23:20:10 +0100
committerColin Watson <cjwatson@debian.org>2012-09-06 23:20:10 +0100
commitc6a2c0334e45419875687d250aed9bea78480f2e (patch)
treed8f01bef9f3921fa1ca7592a19474be9c8349f76 /ssh-keygen.1
parentdd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff)
parent8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff)
merge 6.1p1
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.118
1 files changed, 15 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 41da2077b..03f927edf 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.108 2011/10/16 11:02:46 dtucker Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.109 2012/07/06 00:41:59 dtucker 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: October 16 2011 $ 38.Dd $Mdocdate: July 6 2012 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -104,6 +104,8 @@
104.Fl f Ar input_file 104.Fl f Ar input_file
105.Op Fl v 105.Op Fl v
106.Op Fl a Ar num_trials 106.Op Fl a Ar num_trials
107.Op Fl J Ar num_lines
108.Op Fl j Ar start_line
107.Op Fl K Ar checkpt 109.Op Fl K Ar checkpt
108.Op Fl W Ar generator 110.Op Fl W Ar generator
109.Nm ssh-keygen 111.Nm ssh-keygen
@@ -297,6 +299,16 @@ in the format specified by the
297.Fl m 299.Fl m
298option and print an OpenSSH compatible private 300option and print an OpenSSH compatible private
299(or public) key to stdout. 301(or public) key to stdout.
302.It Fl J Ar num_lines
303Exit after screening the specified number of lines
304while performing DH candidate screening using the
305.Fl T
306option.
307.It Fl j Ar start_line
308Start screening at the specified line number
309while performing DH candidate screening using the
310.Fl T
311option.
300.It Fl K Ar checkpt 312.It Fl K Ar checkpt
301Write the last line processed to the file 313Write the last line processed to the file
302.Ar checkpt 314.Ar checkpt
@@ -518,7 +530,7 @@ This may be overridden using the
518.Fl S 530.Fl S
519option, which specifies a different start point (in hex). 531option, which specifies a different start point (in hex).
520.Pp 532.Pp
521Once a set of candidates have been generated, they must be tested for 533Once a set of candidates have been generated, they must be screened for
522suitability. 534suitability.
523This may be performed using the 535This may be performed using the
524.Fl T 536.Fl T