diff options
| author | jmc@openbsd.org <jmc@openbsd.org> | 2015-08-14 15:32:41 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-08-19 10:47:16 +1000 |
| commit | 1f8d3d629cd553031021068eb9c646a5f1e50994 (patch) | |
| tree | 9c30f98e68084852cfa7f17e7716abf6be8d77c5 | |
| parent | 1dc8d93ce69d6565747eb44446ed117187621b26 (diff) | |
upstream commit
match myproposal.h order; from brian conway (i snuck in a
tweak while here)
ok dtucker
Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67
| -rw-r--r-- | ssh_config.5 | 6 | ||||
| -rw-r--r-- | sshd_config.5 | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 5b0975f87..a47f3ca9e 100644 --- a/ssh_config.5 +++ b/ssh_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: ssh_config.5,v 1.214 2015/07/30 00:01:34 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.215 2015/08/14 15:32:41 jmc Exp $ |
| 37 | .Dd $Mdocdate: July 30 2015 $ | 37 | .Dd $Mdocdate: August 14 2015 $ |
| 38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -415,9 +415,9 @@ chacha20-poly1305@openssh.com | |||
| 415 | .Pp | 415 | .Pp |
| 416 | The default is: | 416 | The default is: |
| 417 | .Bd -literal -offset indent | 417 | .Bd -literal -offset indent |
| 418 | chacha20-poly1305@openssh.com, | ||
| 418 | aes128-ctr,aes192-ctr,aes256-ctr, | 419 | aes128-ctr,aes192-ctr,aes256-ctr, |
| 419 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, | 420 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, |
| 420 | chacha20-poly1305@openssh.com, | ||
| 421 | arcfour256,arcfour128, | 421 | arcfour256,arcfour128, |
| 422 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc, | 422 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc, |
| 423 | aes192-cbc,aes256-cbc,arcfour | 423 | aes192-cbc,aes256-cbc,arcfour |
diff --git a/sshd_config.5 b/sshd_config.5 index 58e277f95..b18d340af 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.210 2015/08/06 14:53:21 deraadt Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.211 2015/08/14 15:32:41 jmc Exp $ |
| 37 | .Dd $Mdocdate: August 6 2015 $ | 37 | .Dd $Mdocdate: August 14 2015 $ |
| 38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -476,9 +476,9 @@ chacha20-poly1305@openssh.com | |||
| 476 | .Pp | 476 | .Pp |
| 477 | The default is: | 477 | The default is: |
| 478 | .Bd -literal -offset indent | 478 | .Bd -literal -offset indent |
| 479 | chacha20-poly1305@openssh.com, | ||
| 479 | aes128-ctr,aes192-ctr,aes256-ctr, | 480 | aes128-ctr,aes192-ctr,aes256-ctr, |
| 480 | aes128-gcm@openssh.com,aes256-gcm@openssh.com, | 481 | aes128-gcm@openssh.com,aes256-gcm@openssh.com |
| 481 | chacha20-poly1305@openssh.com | ||
| 482 | .Ed | 482 | .Ed |
| 483 | .Pp | 483 | .Pp |
| 484 | The list of available ciphers may also be obtained using the | 484 | The list of available ciphers may also be obtained using the |
| @@ -1528,7 +1528,7 @@ If this option is set to | |||
| 1528 | .Pa ~/.ssh/known_hosts | 1528 | .Pa ~/.ssh/known_hosts |
| 1529 | .Cm from | 1529 | .Cm from |
| 1530 | and | 1530 | and |
| 1531 | .Xr sshd_config 5 | 1531 | .Nm |
| 1532 | .Cm Match | 1532 | .Cm Match |
| 1533 | .Cm Host | 1533 | .Cm Host |
| 1534 | directives. | 1534 | directives. |