summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-05 10:22:39 +1100
committerDamien Miller <djm@mindrot.org>2013-12-05 10:22:39 +1100
commite4870c090629e32f2cb649dc16d575eeb693f4a8 (patch)
treeea6d92cb20f9e76fc23271b6e80769d08a4d3354
parent1d2f8804a6d33a4e908b876b2e1266b8260ec76b (diff)
- djm@cvs.openbsd.org 2013/12/01 23:19:05
[PROTOCOL] mention curve25519-sha256@libssh.org key exchange algorithm
-rw-r--r--ChangeLog3
-rw-r--r--PROTOCOL8
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 65cc0466..336cb2af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
[pkcs11.h]
cleanup 1 << 31 idioms. Resurrection of this issue pointed out by
Eitan Adler ok markus for ssh, implies same change in kerberosV
+ - djm@cvs.openbsd.org 2013/12/01 23:19:05
+ [PROTOCOL]
+ mention curve25519-sha256@libssh.org key exchange algorithm
20131121
- (djm) OpenBSD CVS Sync
diff --git a/PROTOCOL b/PROTOCOL
index cace97f8..4a5088f9 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -96,6 +96,12 @@ a matching MAC.
OpenSSH supports authenticated encryption using ChaCha20 and Poly1305
as described in PROTOCOL.chacha20poly1305.
+1.8 transport: curve25519-sha256@libssh.org key exchange algorithm
+
+OpenSSH supports the use of ECDH in Curve25519 for key exchange as
+described at:
+http://git.libssh.org/users/aris/libssh.git/plain/doc/curve25519-sha256@libssh.org.txt?h=curve25519
+
2. Connection protocol changes
2.1. connection: Channel write close extension "eow@openssh.com"
@@ -350,4 +356,4 @@ respond with a SSH_FXP_STATUS message.
This extension is advertised in the SSH_FXP_VERSION hello with version
"1".
-$OpenBSD: PROTOCOL,v 1.22 2013/11/21 00:45:43 djm Exp $
+$OpenBSD: PROTOCOL,v 1.23 2013/12/01 23:19:05 djm Exp $