summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-10-18 16:05:19 +1100
committerDamien Miller <djm@mindrot.org>2011-10-18 16:05:19 +1100
commit390d0561fccfba5e2e97105f75b70b32aab59578 (patch)
treec1baadb7c116489ef2a6260d06fac81d66208c3e /ssh-keygen.1
parentd3e6990c4ca1e6c8ad9e66f5e57a2b4545dbc940 (diff)
- dtucker@cvs.openbsd.org 2011/10/16 11:02:46
[moduli.c ssh-keygen.1 ssh-keygen.c] Add optional checkpoints for moduli screening. feedback & ok deraadt
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.113
1 files changed, 11 insertions, 2 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 528fcd39d..41da2077b 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.107 2011/09/07 02:18:31 deraadt Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.108 2011/10/16 11:02:46 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: September 7 2011 $ 38.Dd $Mdocdate: October 16 2011 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -104,6 +104,7 @@
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 K Ar checkpt
107.Op Fl W Ar generator 108.Op Fl W Ar generator
108.Nm ssh-keygen 109.Nm ssh-keygen
109.Fl s Ar ca_key 110.Fl s Ar ca_key
@@ -296,6 +297,14 @@ in the format specified by the
296.Fl m 297.Fl m
297option and print an OpenSSH compatible private 298option and print an OpenSSH compatible private
298(or public) key to stdout. 299(or public) key to stdout.
300.It Fl K Ar checkpt
301Write the last line processed to the file
302.Ar checkpt
303while performing DH candidate screening using the
304.Fl T
305option.
306This will be used to skip lines in the input file that have already been
307processed if the job is restarted.
299This option allows importing keys from other software, including several 308This option allows importing keys from other software, including several
300commercial SSH implementations. 309commercial SSH implementations.
301The default import format is 310The default import format is