diff options
| author | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:14 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:14 +1000 |
| commit | d5f62bf280b0798d7009d4424594a648a4e887fb (patch) | |
| tree | 5f18078ea61f6c5503dc4addfb2f17d13844692c /ssh_config.5 | |
| parent | 603134e077e667b4819effb0e121803842df621f (diff) | |
| download | openssh-git-d5f62bf280b0798d7009d4424594a648a4e887fb.tar.gz | |
- djm@cvs.openbsd.org 2010/09/22 05:01:30
[kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h]
[servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5]
add a KexAlgorithms knob to the client and server configuration to allow
selection of which key exchange methods are used by ssh(1) and sshd(8)
and their order of preference.
ok markus@
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 33038ffc..6e49842a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,8 +34,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.139 2010/08/31 11:54:45 djm Exp $ -.Dd $Mdocdate: August 31 2010 $ +.\" $OpenBSD: ssh_config.5,v 1.140 2010/09/22 05:01:29 djm Exp $ +.Dd $Mdocdate: September 22 2010 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -646,6 +646,17 @@ it may be zero or more of: .Dq pam , and .Dq skey . +.It Cm KexAlgorithms +Specifies the available KEX (Key Exchange) algorithms. +Multiple algorithms must be comma-separated. +The default is +.Dq ecdh-sha2-nistp256 , +.Dq ecdh-sha2-nistp384 , +.Dq ecdh-sha2-nistp521 , +.Dq diffie-hellman-group-exchange-sha256 , +.Dq diffie-hellman-group-exchange-sha1 , +.Dq diffie-hellman-group14-sha1 , +.Dq diffie-hellman-group1-sha1 . .It Cm LocalCommand Specifies a command to execute on the local machine after successfully connecting to the server. |