diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | scp.1 | 5 | ||||
-rw-r--r-- | sftp.1 | 5 | ||||
-rw-r--r-- | ssh.1 | 5 | ||||
-rw-r--r-- | sshd_config.5 | 6 |
5 files changed, 15 insertions, 9 deletions
@@ -17,6 +17,9 @@ | |||
17 | - jmc@cvs.openbsd.org 2010/11/15 07:40:14 | 17 | - jmc@cvs.openbsd.org 2010/11/15 07:40:14 |
18 | [ssh_config.5] | 18 | [ssh_config.5] |
19 | libary -> library; | 19 | libary -> library; |
20 | - jmc@cvs.openbsd.org 2010/11/18 15:01:00 | ||
21 | [scp.1 sftp.1 ssh.1 sshd_config.5] | ||
22 | add IPQoS to the various -o lists, and zap some trailing whitespace; | ||
20 | 23 | ||
21 | 20101111 | 24 | 20101111 |
22 | - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on | 25 | - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on |
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.53 2010/10/28 18:33:28 jmc Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.54 2010/11/18 15:01:00 jmc Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: October 28 2010 $ | 13 | .Dd $Mdocdate: November 18 2010 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -146,6 +146,7 @@ For full details of the options listed below, and their possible values, see | |||
146 | .It HostName | 146 | .It HostName |
147 | .It IdentityFile | 147 | .It IdentityFile |
148 | .It IdentitiesOnly | 148 | .It IdentitiesOnly |
149 | .It IPQoS | ||
149 | .It KbdInteractiveDevices | 150 | .It KbdInteractiveDevices |
150 | .It KexAlgorithms | 151 | .It KexAlgorithms |
151 | .It LogLevel | 152 | .It LogLevel |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.86 2010/09/23 13:36:46 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.87 2010/11/18 15:01:00 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: September 23 2010 $ | 25 | .Dd $Mdocdate: November 18 2010 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -201,6 +201,7 @@ For full details of the options listed below, and their possible values, see | |||
201 | .It HostName | 201 | .It HostName |
202 | .It IdentityFile | 202 | .It IdentityFile |
203 | .It IdentitiesOnly | 203 | .It IdentitiesOnly |
204 | .It IPQoS | ||
204 | .It KbdInteractiveDevices | 205 | .It KbdInteractiveDevices |
205 | .It KexAlgorithms | 206 | .It KexAlgorithms |
206 | .It LogLevel | 207 | .It LogLevel |
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.315 2010/10/28 18:33:28 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.316 2010/11/18 15:01:00 jmc Exp $ |
37 | .Dd $Mdocdate: October 28 2010 $ | 37 | .Dd $Mdocdate: November 18 2010 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -435,6 +435,7 @@ For full details of the options listed below, and their possible values, see | |||
435 | .It HostName | 435 | .It HostName |
436 | .It IdentityFile | 436 | .It IdentityFile |
437 | .It IdentitiesOnly | 437 | .It IdentitiesOnly |
438 | .It IPQoS | ||
438 | .It KbdInteractiveDevices | 439 | .It KbdInteractiveDevices |
439 | .It KexAlgorithms | 440 | .It KexAlgorithms |
440 | .It LocalCommand | 441 | .It LocalCommand |
diff --git a/sshd_config.5 b/sshd_config.5 index 60808d233..d070a6de0 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.129 2010/11/13 23:27:51 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.130 2010/11/18 15:01:00 jmc Exp $ |
37 | .Dd $Mdocdate: November 13 2010 $ | 37 | .Dd $Mdocdate: November 18 2010 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -581,7 +581,7 @@ The default is | |||
581 | .Dq ecdh-sha2-nistp256 , | 581 | .Dq ecdh-sha2-nistp256 , |
582 | .Dq ecdh-sha2-nistp384 , | 582 | .Dq ecdh-sha2-nistp384 , |
583 | .Dq ecdh-sha2-nistp521 , | 583 | .Dq ecdh-sha2-nistp521 , |
584 | .Dq diffie-hellman-group-exchange-sha256 , | 584 | .Dq diffie-hellman-group-exchange-sha256 , |
585 | .Dq diffie-hellman-group-exchange-sha1 , | 585 | .Dq diffie-hellman-group-exchange-sha1 , |
586 | .Dq diffie-hellman-group14-sha1 , | 586 | .Dq diffie-hellman-group14-sha1 , |
587 | .Dq diffie-hellman-group1-sha1 . | 587 | .Dq diffie-hellman-group1-sha1 . |