diff options
author | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:53 +1000 |
commit | 7fe2b1fec3b364faf952828f3875b8e7eed8feb4 (patch) | |
tree | 990bc603f5a01b374aa2759eb9cfe542b546da0c | |
parent | d5f62bf280b0798d7009d4424594a648a4e887fb (diff) |
- jmc@cvs.openbsd.org 2010/09/22 08:30:08
[ssh.1 ssh_config.5]
ssh.1: add kexalgorithms to the -o list
ssh_config.5: format the kexalgorithms in a more consistent
(prettier!) way
ok djm
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.1 | 5 | ||||
-rw-r--r-- | ssh_config.5 | 18 |
3 files changed, 18 insertions, 11 deletions
@@ -38,6 +38,12 @@ | |||
38 | selection of which key exchange methods are used by ssh(1) and sshd(8) | 38 | selection of which key exchange methods are used by ssh(1) and sshd(8) |
39 | and their order of preference. | 39 | and their order of preference. |
40 | ok markus@ | 40 | ok markus@ |
41 | - jmc@cvs.openbsd.org 2010/09/22 08:30:08 | ||
42 | [ssh.1 ssh_config.5] | ||
43 | ssh.1: add kexalgorithms to the -o list | ||
44 | ssh_config.5: format the kexalgorithms in a more consistent | ||
45 | (prettier!) way | ||
46 | ok djm | ||
41 | 47 | ||
42 | 20100910 | 48 | 20100910 |
43 | - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact | 49 | - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact |
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.313 2010/09/11 21:44:20 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.314 2010/09/22 08:30:08 jmc Exp $ |
38 | .Dd $Mdocdate: September 11 2010 $ | 38 | .Dd $Mdocdate: September 22 2010 $ |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -437,6 +437,7 @@ For full details of the options listed below, and their possible values, see | |||
437 | .It IdentityFile | 437 | .It IdentityFile |
438 | .It IdentitiesOnly | 438 | .It IdentitiesOnly |
439 | .It KbdInteractiveDevices | 439 | .It KbdInteractiveDevices |
440 | .It KexAlgorithms | ||
440 | .It LocalCommand | 441 | .It LocalCommand |
441 | .It LocalForward | 442 | .It LocalForward |
442 | .It LogLevel | 443 | .It LogLevel |
diff --git a/ssh_config.5 b/ssh_config.5 index 6e49842a7..4a71e2af0 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.140 2010/09/22 05:01:29 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.141 2010/09/22 08:30:08 jmc Exp $ |
38 | .Dd $Mdocdate: September 22 2010 $ | 38 | .Dd $Mdocdate: September 22 2010 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -649,14 +649,14 @@ and | |||
649 | .It Cm KexAlgorithms | 649 | .It Cm KexAlgorithms |
650 | Specifies the available KEX (Key Exchange) algorithms. | 650 | Specifies the available KEX (Key Exchange) algorithms. |
651 | Multiple algorithms must be comma-separated. | 651 | Multiple algorithms must be comma-separated. |
652 | The default is | 652 | The default is: |
653 | .Dq ecdh-sha2-nistp256 , | 653 | .Bd -literal -offset indent |
654 | .Dq ecdh-sha2-nistp384 , | 654 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, |
655 | .Dq ecdh-sha2-nistp521 , | 655 | diffie-hellman-group-exchange-sha256, |
656 | .Dq diffie-hellman-group-exchange-sha256 , | 656 | diffie-hellman-group-exchange-sha1, |
657 | .Dq diffie-hellman-group-exchange-sha1 , | 657 | diffie-hellman-group14-sha1, |
658 | .Dq diffie-hellman-group14-sha1 , | 658 | diffie-hellman-group1-sha1 |
659 | .Dq diffie-hellman-group1-sha1 . | 659 | .Ed |
660 | .It Cm LocalCommand | 660 | .It Cm LocalCommand |
661 | Specifies a command to execute on the local machine after successfully | 661 | Specifies a command to execute on the local machine after successfully |
662 | connecting to the server. | 662 | connecting to the server. |