diff options
| author | Damien Miller <djm@mindrot.org> | 2014-04-20 05:23:03 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-04-20 05:23:03 +0200 |
| commit | 43b156cf72f900f88065b0a1c1ebd09ab733ca46 (patch) | |
| tree | 09e222dc213179ed503976618a1f6e50b610636c /ssh-keygen.1 | |
| parent | - naddy@cvs.openbsd.org 2014/03/28 05:17:11 (diff) | |
| download | openssh-43b156cf72f900f88065b0a1c1ebd09ab733ca46.tar.xz openssh-43b156cf72f900f88065b0a1c1ebd09ab733ca46.zip | |
- jmc@cvs.openbsd.org 2014/03/31 13:39:34
[ssh-keygen.1]
the text for the -K option was inserted in the wrong place in -r1.108;
fix From: Matthew Clarke
Diffstat (limited to '')
| -rw-r--r-- | ssh-keygen.1 | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.121 2014/03/15 17:28:26 deraadt Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,7 +35,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 $Mdocdate: March 15 2014 $ +.Dd $Mdocdate: March 31 2014 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -332,6 +332,10 @@ in the format specified by the .Fl m option and print an OpenSSH compatible private (or public) key to stdout. +This option allows importing keys from other software, including several +commercial SSH implementations. +The default import format is +.Dq RFC4716 . .It Fl J Ar num_lines Exit after screening the specified number of lines while performing DH candidate screening using the @@ -350,10 +354,6 @@ while performing DH candidate screening using the 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 -.Dq RFC4716 . .It Fl k Generate a KRL file. In this mode, |