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@

---
 kex.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'kex.c')

diff --git a/kex.c b/kex.c
index 54bd1a438..07f25e2e2 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.91 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.92 2013/11/02 21:59:15 markus Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -80,6 +80,7 @@ static const struct kexalg kexalgs[] = {
 	{ KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 },
 	{ KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 },
 #endif
+	{ KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, EVP_sha256 },
 	{ NULL, -1, -1, NULL},
 };
 
-- 
cgit v1.2.3