diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh-keygen.1 | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -65,6 +65,10 @@ | |||
65 | [ssh_config.5 sshd_config.5] | 65 | [ssh_config.5 sshd_config.5] |
66 | sync available and default algorithms, improve algorithm list formatting | 66 | sync available and default algorithms, improve algorithm list formatting |
67 | help from jmc@ and schwarze@, ok deraadt@ | 67 | help from jmc@ and schwarze@, ok deraadt@ |
68 | - jmc@cvs.openbsd.org 2014/03/31 13:39:34 | ||
69 | [ssh-keygen.1] | ||
70 | the text for the -K option was inserted in the wrong place in -r1.108; | ||
71 | fix From: Matthew Clarke | ||
68 | 72 | ||
69 | 20140401 | 73 | 20140401 |
70 | - (djm) On platforms that support it, use prctl() to prevent sftp-server | 74 | - (djm) On platforms that support it, use prctl() to prevent sftp-server |
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 |
333 | option and print an OpenSSH compatible private | 333 | option and print an OpenSSH compatible private |
334 | (or public) key to stdout. | 334 | (or public) key to stdout. |
335 | This option allows importing keys from other software, including several | ||
336 | commercial SSH implementations. | ||
337 | The default import format is | ||
338 | .Dq RFC4716 . | ||
335 | .It Fl J Ar num_lines | 339 | .It Fl J Ar num_lines |
336 | Exit after screening the specified number of lines | 340 | Exit after screening the specified number of lines |
337 | while performing DH candidate screening using the | 341 | while performing DH candidate screening using the |
@@ -350,10 +354,6 @@ while performing DH candidate screening using the | |||
350 | option. | 354 | option. |
351 | This will be used to skip lines in the input file that have already been | 355 | This will be used to skip lines in the input file that have already been |
352 | processed if the job is restarted. | 356 | processed if the job is restarted. |
353 | This option allows importing keys from other software, including several | ||
354 | commercial SSH implementations. | ||
355 | The default import format is | ||
356 | .Dq RFC4716 . | ||
357 | .It Fl k | 357 | .It Fl k |
358 | Generate a KRL file. | 358 | Generate a KRL file. |
359 | In this mode, | 359 | In this mode, |