summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-04 08:55:43 +1100
committerDamien Miller <djm@mindrot.org>2013-11-04 08:55:43 +1100
commit0bd8f1519d51af8d4229be81e8f2f4903a1d440b (patch)
treee61b058cda8d5ba4ccbc3361a4a21fafcb53efdb /ssh_config.5
parent4c3ba0767fbe4a8a2a748df4035aaf86651f6b30 (diff)
- 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.55
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 3ef494618..8809568a6 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.178 2013/10/24 00:51:48 dtucker Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.179 2013/11/02 22:39:19 markus Exp $
37.Dd $Mdocdate: October 24 2013 $ 37.Dd $Mdocdate: November 2 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -873,6 +873,7 @@ Specifies the available KEX (Key Exchange) algorithms.
873Multiple algorithms must be comma-separated. 873Multiple algorithms must be comma-separated.
874The default is: 874The default is:
875.Bd -literal -offset indent 875.Bd -literal -offset indent
876curve25519-sha256@libssh.org,
876ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, 877ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
877diffie-hellman-group-exchange-sha256, 878diffie-hellman-group-exchange-sha256,
878diffie-hellman-group-exchange-sha1, 879diffie-hellman-group-exchange-sha1,