summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
committerColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
commiteab78da6a54225de06271d9c8da650f04a55ed88 (patch)
treeaa258ca77515939f6d89317ff67fbcb0bca08b24 /ssh-keygen.1
parenta26f5de49df59322fde07f7be91b3e3969c9c238 (diff)
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs. - Allow "PermitOpen none" to refuse all port-forwarding requests (closes: #543683).
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.118
1 files changed, 15 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index f7e3ea4c6..fe26750a4 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.108 2011/10/16 11:02:46 dtucker Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.109 2012/07/06 00:41:59 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: October 16 2011 $ 38.Dd $Mdocdate: July 6 2012 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -104,6 +104,8 @@
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 J Ar num_lines
108.Op Fl j Ar start_line
107.Op Fl K Ar checkpt 109.Op Fl K Ar checkpt
108.Op Fl W Ar generator 110.Op Fl W Ar generator
109.Nm ssh-keygen 111.Nm ssh-keygen
@@ -293,6 +295,16 @@ in the format specified by the
293.Fl m 295.Fl m
294option and print an OpenSSH compatible private 296option and print an OpenSSH compatible private
295(or public) key to stdout. 297(or public) key to stdout.
298.It Fl J Ar num_lines
299Exit after screening the specified number of lines
300while performing DH candidate screening using the
301.Fl T
302option.
303.It Fl j Ar start_line
304Start screening at the specified line number
305while performing DH candidate screening using the
306.Fl T
307option.
296.It Fl K Ar checkpt 308.It Fl K Ar checkpt
297Write the last line processed to the file 309Write the last line processed to the file
298.Ar checkpt 310.Ar checkpt
@@ -514,7 +526,7 @@ This may be overridden using the
514.Fl S 526.Fl S
515option, which specifies a different start point (in hex). 527option, which specifies a different start point (in hex).
516.Pp 528.Pp
517Once a set of candidates have been generated, they must be tested for 529Once a set of candidates have been generated, they must be screened for
518suitability. 530suitability.
519This may be performed using the 531This may be performed using the
520.Fl T 532.Fl T