- djm@cvs.openbsd.org 2013/12/01 23:19:05

     [PROTOCOL]
     mention curve25519-sha256@libssh.org key exchange algorithm

diff --git a/ChangeLog b/ChangeLog
index 65cc0466426ebc72725262cdc01d4484665546d4..336cb2afede16d5304fc7e7a236ff3e9eebe4361 100644 (file)
--- 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 cace97f88bc8ce0004e33207ce953fabedd74022..4a5088f90b50473829882d355f5a5074483eff20 100644 (file)
--- 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 $