RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-23 02:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2014/03/31 13:39:34

Browse Source 
[ssh-keygen.1]
     the text for the -K option was inserted in the wrong place in -r1.108;
     fix From: Matthew Clarke
This commit is contained in:
Damien Miller 2014-04-20 13:23:03 +10:00
parent c1621c84f2
commit 43b156cf72
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -65,6 +65,10 @@
[ssh_config.5 sshd_config.5] [ssh_config.5 sshd_config.5]
sync available and default algorithms, improve algorithm list formatting sync available and default algorithms, improve algorithm list formatting
help from jmc@ and schwarze@, ok deraadt@ help from jmc@ and schwarze@, ok deraadt@
- 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
20140401 20140401
- (djm) On platforms that support it, use prctl() to prevent sftp-server - (djm) On platforms that support it, use prctl() to prevent sftp-server

12
ssh-keygen.1
View File

@ -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> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" 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 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -332,6 +332,10 @@ in the format specified by the
.Fl m .Fl m
option and print an OpenSSH compatible private option and print an OpenSSH compatible private
(or public) key to stdout. (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 .It Fl J Ar num_lines
Exit after screening the specified number of lines Exit after screening the specified number of lines
while performing DH candidate screening using the while performing DH candidate screening using the
@ -350,10 +354,6 @@ while performing DH candidate screening using the
option. option.
This will be used to skip lines in the input file that have already been This will be used to skip lines in the input file that have already been
processed if the job is restarted. 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 .It Fl k
Generate a KRL file. Generate a KRL file.
In this mode, In this mode,