From 1e1242604eb0fd510fe93f81245c529237ffc513 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 4 Nov 2013 08:26:52 +1100
Subject:    - markus@cvs.openbsd.org 2013/11/02 21:59:15      [kex.c kex.h
 myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]      use curve25519 for
 default key exchange (curve25519-sha256@libssh.org);      initial patch from
 Aris Adamantiadis; ok djm@

---
 myproposal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'myproposal.h')

diff --git a/myproposal.h b/myproposal.h
index 4e913e3c..0820749a 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: myproposal.h,v 1.33 2013/11/02 21:59:15 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -66,6 +66,7 @@
 #endif
 
 # define KEX_DEFAULT_KEX \
+	"curve25519-sha256@libssh.org," \
 	KEX_ECDH_METHODS \
 	KEX_SHA256_METHODS \
 	"diffie-hellman-group-exchange-sha1," \
-- 
cgit v1.2.1