diff options
author | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
commit | 00f3582ac62b9883e85e2cb420c3d9f5d9028188 (patch) | |
tree | eafe8a40bcffb53c6bb88d75ac823cdc99ac92fe /crypto/openssh/ssh-keygen.1 | |
parent | d00fafff0e6a902c30e2a606c69d740558908f1d (diff) | |
download | FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.zip FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.tar.gz |
Upgrade OpenSSH to 6.1p1.
Diffstat (limited to 'crypto/openssh/ssh-keygen.1')
-rw-r--r-- | crypto/openssh/ssh-keygen.1 | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/crypto/openssh/ssh-keygen.1 b/crypto/openssh/ssh-keygen.1 index 6c55c22..2613083 100644 --- a/crypto/openssh/ssh-keygen.1 +++ b/crypto/openssh/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.109 2012/07/06 00:41:59 dtucker Exp $ .\" $FreeBSD$ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -36,7 +36,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 13, 2011 +.Dd July 6 2012 .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -105,6 +105,9 @@ .Fl f Ar input_file .Op Fl v .Op Fl a Ar num_trials +.Op Fl J Ar num_lines +.Op Fl j Ar start_line +.Op Fl K Ar checkpt .Op Fl W Ar generator .Nm ssh-keygen .Fl s Ar ca_key @@ -215,7 +218,7 @@ Generally, 2048 bits is considered sufficient. DSA keys must be exactly 1024 bits as specified by FIPS 186-2. For ECDSA keys, the .Fl b -flag determines they key length by selecting from one of three elliptic +flag determines the key length by selecting from one of three elliptic curve sizes: 256, 384 or 521 bits. Attempting to use bit lengths other than these three values for ECDSA keys will fail. @@ -297,6 +300,24 @@ in the format specified by the .Fl m option and print an OpenSSH compatible private (or public) key to stdout. +.It Fl J Ar num_lines +Exit after screening the specified number of lines +while performing DH candidate screening using the +.Fl T +option. +.It Fl j Ar start_line +Start screening at the specified line number +while performing DH candidate screening using the +.Fl T +option. +.It Fl K Ar checkpt +Write the last line processed to the file +.Ar checkpt +while performing DH candidate screening using the +.Fl T +option. +This will be used to skip lines in the input file that have already been +processed if the job is restarted. This option allows importing keys from other software, including several commercial SSH implementations. The default import format is @@ -510,7 +531,7 @@ This may be overridden using the .Fl S option, which specifies a different start point (in hex). .Pp -Once a set of candidates have been generated, they must be tested for +Once a set of candidates have been generated, they must be screened for suitability. This may be performed using the .Fl T |