diff options
author | djm <djm> | 2013-11-03 21:55:44 +0000 |
---|---|---|
committer | djm <djm> | 2013-11-03 21:55:44 +0000 |
commit | eed617960fdf81ea44a599a3eb96c575678ca972 (patch) | |
tree | 6565362fab0b21a17f2e8be3a822dbda6ef2e72b /ssh_config.5 | |
parent | 9f4ba86b39be3a0e0f97c5ce7323d8aff064a93a (diff) | |
download | openssh-eed617960fdf81ea44a599a3eb96c575678ca972.tar.gz |
- markus@cvs.openbsd.org 2013/11/02 22:39:19
[ssh_config.5 sshd_config.5]
the default kex is now curve25519-sha256@libssh.org
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 3ef49461..8809568a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,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.178 2013/10/24 00:51:48 dtucker Exp $ -.Dd $Mdocdate: October 24 2013 $ +.\" $OpenBSD: ssh_config.5,v 1.179 2013/11/02 22:39:19 markus Exp $ +.Dd $Mdocdate: November 2 2013 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -873,6 +873,7 @@ Specifies the available KEX (Key Exchange) algorithms. Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent +curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, diffie-hellman-group-exchange-sha1, |