diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /ssh-keygen.1 | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 7c8b1f202..f7e3ea4c6 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm 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: April 13 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 |
@@ -210,7 +211,7 @@ Generally, 2048 bits is considered sufficient. | |||
210 | DSA keys must be exactly 1024 bits as specified by FIPS 186-2. | 211 | DSA keys must be exactly 1024 bits as specified by FIPS 186-2. |
211 | For ECDSA keys, the | 212 | For ECDSA keys, the |
212 | .Fl b | 213 | .Fl b |
213 | flag determines they key length by selecting from one of three elliptic | 214 | flag determines the key length by selecting from one of three elliptic |
214 | curve sizes: 256, 384 or 521 bits. | 215 | curve sizes: 256, 384 or 521 bits. |
215 | Attempting to use bit lengths other than these three values for ECDSA keys | 216 | Attempting to use bit lengths other than these three values for ECDSA keys |
216 | will fail. | 217 | will fail. |
@@ -292,6 +293,14 @@ in the format specified by the | |||
292 | .Fl m | 293 | .Fl m |
293 | option and print an OpenSSH compatible private | 294 | option and print an OpenSSH compatible private |
294 | (or public) key to stdout. | 295 | (or public) key to stdout. |
296 | .It Fl K Ar checkpt | ||
297 | Write the last line processed to the file | ||
298 | .Ar checkpt | ||
299 | while performing DH candidate screening using the | ||
300 | .Fl T | ||
301 | option. | ||
302 | This will be used to skip lines in the input file that have already been | ||
303 | processed if the job is restarted. | ||
295 | This option allows importing keys from other software, including several | 304 | This option allows importing keys from other software, including several |
296 | commercial SSH implementations. | 305 | commercial SSH implementations. |
297 | The default import format is | 306 | The default import format is |